maxmustermann/godot
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge pull request #30487 from szamq/master

Browse source 
Fix get_data layer argument when texture is TEXTURE_TYPE_2D_ARRAY
This commit is contained in:
Rémi Verschelde 2019-07-10 15:16:57 +02:00 committed by GitHub
parent 9496e29326 d5cb280313
commit 351163ce95
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
drivers/gles3/rasterizer_storage_gles3.cpp
View file

@ -1144,8 +1144,12 @@ Ref<Image> RasterizerStorageGLES3::texture_get_data(RID p_texture, int p_layer)
shaders.copy.set_conditional(CopyShaderGLES3::USE_TEXTURE2DARRAY, texture->type == VS::TEXTURE_TYPE_2D_ARRAY);
shaders.copy.bind();
// calculate the normalized z coordinate for the layer
float layer = (float)p_layer / (float)texture->alloc_depth;
float layer;
if (texture->type == VS::TEXTURE_TYPE_2D_ARRAY)
layer = (float)p_layer;
else
// calculate the normalized z coordinate for the layer
layer = (float)p_layer / (float)texture->alloc_depth;
shaders.copy.set_uniform(CopyShaderGLES3::LAYER, layer);