mirror of
https://github.com/RPCS3/rpcs3.git
synced 2025-07-06 23:11:25 +12:00
Fix remap_vector redefinition on macOS (#11271)
This commit is contained in:
parent
c0bafbc804
commit
47e4a95d8f
1 changed files with 2 additions and 2 deletions
|
@ -764,7 +764,7 @@ namespace glsl
|
||||||
OS <<
|
OS <<
|
||||||
|
|
||||||
#ifdef __APPLE__
|
#ifdef __APPLE__
|
||||||
"vec4 remap_vector(const in vec4 rgba, const in uint remap_bits)\n"
|
"vec4 remap_vector_m(const in vec4 rgba, const in uint remap_bits)\n"
|
||||||
"{\n"
|
"{\n"
|
||||||
" uvec4 selector = (uvec4(remap_bits) >> uvec4(3, 6, 9, 0)) & 0x7;\n"
|
" uvec4 selector = (uvec4(remap_bits) >> uvec4(3, 6, 9, 0)) & 0x7;\n"
|
||||||
" bvec4 choice = greaterThan(selector, uvec4(1));\n"
|
" bvec4 choice = greaterThan(selector, uvec4(1));\n"
|
||||||
|
@ -781,7 +781,7 @@ namespace glsl
|
||||||
"{\n"
|
"{\n"
|
||||||
#ifdef __APPLE__
|
#ifdef __APPLE__
|
||||||
" uint remap_bits = (control_bits >> 16) & 0xFFFF;\n"
|
" uint remap_bits = (control_bits >> 16) & 0xFFFF;\n"
|
||||||
" if (remap_bits != 0x8D5) rgba = remap_vector(rgba, remap_bits);\n\n"
|
" if (remap_bits != 0x8D5) rgba = remap_vector_m(rgba, remap_bits);\n\n"
|
||||||
#endif
|
#endif
|
||||||
" if (control_bits == 0)\n"
|
" if (control_bits == 0)\n"
|
||||||
" {\n"
|
" {\n"
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue