AlexIndustrial/mesa
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

mesa: fix logic error in computing enableBits in update_texture_state()

Browse Source 
If we had a vertex shader but no fragment shader (i.e. fixed function) we
didn't get the right enabled texture targets.

Fixes blank/white texture problem.
This commit is contained in:
Brian Paul
2009-02-07 11:20:08 -07:00
parent f6d23943cd
commit b46611633c
1 changed files with 12 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/mesa/main/texstate.c
+12 -10
View File
@@ -488,25 +488,27 @@ update_texture_state( GLcontext *ctx )
texUnit->_ReallyEnabled = 0;
texUnit->_GenFlags = 0;
/* Get the bitmask of texture enables.
/* Get the bitmask of texture target enables.
* enableBits will be a mask of the TEXTURE_*_BIT flags indicating
* which texture targets are enabled (fixed function) or referenced
* by a fragment shader/program. When multiple flags are set, we'll
* settle on the one with highest priority (see texture_override below).
*/
if (fprog || vprog) {
enableBits = 0x0;
if (fprog)
enableBits |= fprog->Base.TexturesUsed[unit];
if (vprog)
enableBits |= vprog->Base.TexturesUsed[unit];
enableBits = 0x0;
if (vprog) {
enableBits |= vprog->Base.TexturesUsed[unit];
}
if (fprog) {
enableBits |= fprog->Base.TexturesUsed[unit];
}
else {
if (!texUnit->Enabled)
continue;
enableBits = texUnit->Enabled;
/* fixed-function fragment program */
enableBits |= texUnit->Enabled;
}
if (enableBits == 0x0)
continue;
ASSERT(texUnit->Current1D);
ASSERT(texUnit->Current2D);
ASSERT(texUnit->Current3D);