DXGL r694 - Code Review
For
DXGL
(
recent comments
|
status changes
|
tags
|
authors
|
states
|
release notes
|
statistics
)
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 @@
1457
1457
Set bit 37 of shaderstate if vertices have normals
1458
1458
Set shader program
1459
1459
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
1460
1472
1461
1473
*/
1462
1474
error = DDERR_CURRENTLYNOTAVAIL;
—
—
@@ -3940,7 +3952,7 @@
3941
3953
glUtil_SetWrap(This->util, i, 0, This->texstages[i].addressu);
3942
3954
glUtil_SetWrap(This->util, i, 1, This->texstages[i].addressv);
3943
3955
}
3944
- glUtil_SetTexture(This->util,i,0);
3956
+ else glUtil_SetTexture(This->util,i,0);
3945
3957
This->ext->glUniform1i(prog->uniforms[128+i],i);
3946
3958
if(This->renderstate[D3DRENDERSTATE_COLORKEYENABLE] && This->texstages[i].texture && (prog->uniforms[142+i] != -1))
3947
3959
{
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