DXGL r783 - Code Review

Jump to navigation Jump to search
Repository:DXGL
Revision:r782‎ | r783 | r784 >
Date:17:50, 29 December 2017
Author:admin
Status:new
Tags:
Comment:
Fix a regression with destination color key Blt.
Remove a gDebugger breakpoint that was used for testing.
Modified paths:
  • /ddraw/glRenderer.cpp (modified) (history)

Diff [purge]

Index: ddraw/glRenderer.cpp
@@ -3070,7 +3070,6 @@
30713071 }
30723072 else if (usedest)
30733073 {
3074 - if (This->ext->GLEXT_GREMEDY_frame_terminator) This->ext->glFrameTerminatorGREMEDY();
30753074 ShaderManager_SetShader(This->shaders, PROG_TEXTURE, NULL, 0);
30763075 glRenderer__DrawBackbufferRect(This, cmd->dest, destrect, destrect2, PROG_TEXTURE);
30773076 This->bltvertices[1].dests = This->bltvertices[3].dests = 0.;
@@ -3339,7 +3338,7 @@
33403339 glUtil_SetScissor(This->util, TRUE, 0, 0, This->backbuffer->levels[0].ddsd.dwWidth, This->backbuffer->levels[0].ddsd.dwHeight);
33413340 glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
33423341 glUtil_SetScissor(This->util, FALSE, 0, 0, 0, 0);
3343 - glUtil_SetTexture(This->util, 0, texture);
 3342+ glUtil_SetTexture(This->util, 8, texture);
33443343 This->ext->glUniform4f(This->shaders->shaders[progtype].view, view[0], view[1], view[2], view[3]);
33453344 This->bltvertices[1].s = This->bltvertices[3].s = (GLfloat)srcrect.left / (GLfloat)texture->levels[0].ddsd.dwWidth;
33463345 This->bltvertices[0].s = This->bltvertices[2].s = (GLfloat)srcrect.right / (GLfloat)texture->levels[0].ddsd.dwWidth;