DXGL r783 - Code Review
For
DXGL
(
recent comments
|
status changes
|
tags
|
authors
|
states
|
release notes
|
statistics
)
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 @@
3071
3071
}
3072
3072
else if (usedest)
3073
3073
{
3074
- if (This->ext->GLEXT_GREMEDY_frame_terminator) This->ext->glFrameTerminatorGREMEDY();
3075
3074
ShaderManager_SetShader(This->shaders, PROG_TEXTURE, NULL, 0);
3076
3075
glRenderer__DrawBackbufferRect(This, cmd->dest, destrect, destrect2, PROG_TEXTURE);
3077
3076
This->bltvertices[1].dests = This->bltvertices[3].dests = 0.;
—
—
@@ -3339,7 +3338,7 @@
3340
3339
glUtil_SetScissor(This->util, TRUE, 0, 0, This->backbuffer->levels[0].ddsd.dwWidth, This->backbuffer->levels[0].ddsd.dwHeight);
3341
3340
glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
3342
3341
glUtil_SetScissor(This->util, FALSE, 0, 0, 0, 0);
3343
- glUtil_SetTexture(This->util, 0, texture);
3342
+ glUtil_SetTexture(This->util, 8, texture);
3344
3343
This->ext->glUniform4f(This->shaders->shaders[progtype].view, view[0], view[1], view[2], view[3]);
3345
3344
This->bltvertices[1].s = This->bltvertices[3].s = (GLfloat)srcrect.left / (GLfloat)texture->levels[0].ddsd.dwWidth;
3346
3345
This->bltvertices[0].s = This->bltvertices[2].s = (GLfloat)srcrect.right / (GLfloat)texture->levels[0].ddsd.dwWidth;
Navigation menu
Personal tools
Log in
Namespaces
Special page
English
expanded
collapsed
Views
More
expanded
collapsed
Search
Navigation
Home
Main page
Recent changes
Random page
MediaWiki help
Introduction
Progress
Downloads
Source code
Build from source
AppDB
Bug reports
Forums
Tools
Special pages
Printable version