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

Fix for bug #17684: GLSL bug with shadows and material nodes,

Browse Source 
missed unbinding a texture giving extremely slow frontbuffer
drawing.
This commit is contained in:
Brecht Van Lommel
2008-10-04 22:21:46 +00:00
parent 639a4ff436
commit 1e0f02c2ef
1 changed files with 14 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
source/blender/gpu/intern/gpu_codegen.c
View File

@@ -516,10 +516,14 @@ static void codegen_set_unique_ids(ListBase *nodes)
input->texid = GET_INT_FROM_POINTER(BLI_ghash_lookup(bindhash, input->ima));
}
else {
/* input is user created texture, we know there there is
only one, so assign new texid */
input->bindtex = 1;
input->texid = texid++;
if (!BLI_ghash_haskey(bindhash, input->tex)) {
/* input is user created texture, check tex pointer */
input->texid = texid++;
input->bindtex = 1;
BLI_ghash_insert(bindhash, input->tex, SET_INT_IN_POINTER(input->texid));
}
else
input->texid = GET_INT_FROM_POINTER(BLI_ghash_lookup(bindhash, input->tex));
}
/* make sure this pixel is defined exactly once */
@@ -836,11 +840,9 @@ void GPU_pass_bind(GPUPass *pass, double time)
if (input->ima)
input->tex = GPU_texture_from_blender(input->ima, input->iuser, time);
if(input->ima || input->tex) {
if(input->tex) {
GPU_texture_bind(input->tex, input->texid);
GPU_shader_uniform_texture(shader, input->shaderloc, input->tex);
}
if(input->tex && input->bindtex) {
GPU_texture_bind(input->tex, input->texid);
GPU_shader_uniform_texture(shader, input->shaderloc, input->tex);
}
}
}
@@ -871,9 +873,9 @@ void GPU_pass_unbind(GPUPass *pass)
return;
for (input=inputs->first; input; input=input->next) {
if (input->tex)
if(input->bindtex)
GPU_texture_unbind(input->tex);
if(input->tex && input->bindtex)
GPU_texture_unbind(input->tex);
if (input->ima)
input->tex = 0;
}