griefith/test
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Fix: EEVEE-Next: Implicit type conversions

Browse Source 
This was breaking compilation on Mesa drivers.
This commit is contained in:
Clément Foucault
2024-01-08 22:12:01 +13:00
parent 98e465109b
commit 4dad262dbe
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
source/blender/draw/engines/eevee_next/shaders/eevee_gbuffer_lib.glsl
View File

@@ -711,14 +711,14 @@ GBufferWriter gbuffer_pack(GBufferDataUndetermined data_in)
}
/* Return the number of closure as encoded in the give header value. */
uint gbuffer_closure_count(uint header)
int gbuffer_closure_count(uint header)
{
uvec4 closure_types = (uvec4(header) >> uvec4(0u, 4u, 8u, 12u)) & 15u;
if (closure_types.x == GBUF_METAL_CLEARCOAT) {
return 2u;
return 2;
}
return reduce_add(vec4(not(equal(closure_types, uvec4(0u)))));
return reduce_add(ivec4(not(equal(closure_types, uvec4(0u)))));
}
GBufferReader gbuffer_read_header_closure_types(uint header)
@@ -728,7 +728,7 @@ GBufferReader gbuffer_read_header_closure_types(uint header)
for (int layer = 0; layer < GBUFFER_LAYER_MAX; layer++) {
GBufferMode mode = gbuffer_header_unpack(header, layer);
int closure_type = CLOSURE_NONE_ID;
ClosureType closure_type = CLOSURE_NONE_ID;
switch (mode) {
case GBUF_DIFFUSE:
closure_type = CLOSURE_BSDF_DIFFUSE_ID;

2
source/blender/draw/engines/eevee_next/shaders/eevee_ray_trace_planar_comp.glsl
View File

@@ -42,7 +42,7 @@ void main()
uint gbuf_header = texelFetch(gbuf_header_tx, texel_fullres, 0).r;
GBufferReader gbuf = gbuffer_read_header_closure_types(gbuf_header);
uint closure_type = gbuffer_closure_get(gbuf, closure_index).type;
ClosureType closure_type = gbuffer_closure_get(gbuf, closure_index).type;
if ((closure_type == CLOSURE_BSDF_TRANSLUCENT_ID) ||
(closure_type == CLOSURE_BSDF_MICROFACET_GGX_REFRACTION_ID))