DXGL r694 - Code Review

Jump to navigation Jump to search
Repository:DXGL
Revision:r693‎ | r694 | r695 >
Date:04:27, 15 January 2017
Author:admin
Status:new
Tags:
Comment:
Add a missing "else" while continuing to document OP_DRAWPRIMITIVES
Modified paths:
  • /ddraw/glRenderer.cpp (modified) (history)

Diff [purge]

Index: ddraw/glRenderer.cpp
@@ -1456,6 +1456,18 @@
14571457 Set bit 37 of shaderstate if vertices have normals
14581458 Set shader program
14591459 Tell renderer to set depth compare mode, depth test, and depth write
 1460+ Set shader attributes
 1461+ Set modelview matrix
 1462+ Set projection matrix
 1463+ Set material
 1464+ Set lights
 1465+ Set ambient color uniform
 1466+ For each texture stage:
 1467+ Skip if colorop is disable
 1468+ Upload texture if dirty
 1469+ Set texure filter
 1470+ Bind texture to texture unit
 1471+ Set texture wrap
14601472
14611473 */
14621474 error = DDERR_CURRENTLYNOTAVAIL;
@@ -3940,7 +3952,7 @@
39413953 glUtil_SetWrap(This->util, i, 0, This->texstages[i].addressu);
39423954 glUtil_SetWrap(This->util, i, 1, This->texstages[i].addressv);
39433955 }
3944 - glUtil_SetTexture(This->util,i,0);
 3956+ else glUtil_SetTexture(This->util,i,0);
39453957 This->ext->glUniform1i(prog->uniforms[128+i],i);
39463958 if(This->renderstate[D3DRENDERSTATE_COLORKEYENABLE] && This->texstages[i].texture && (prog->uniforms[142+i] != -1))
39473959 {