Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
W
wine-winehq
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
wine
wine-winehq
Commits
1183383a
Commit
1183383a
authored
Nov 05, 2010
by
Michael Stefaniuc
Committed by
Alexandre Julliard
Nov 05, 2010
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
wined3d: Fix some checkGLcall() messages.
parent
809741d5
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
5 additions
and
5 deletions
+5
-5
basetexture.c
dlls/wined3d/basetexture.c
+1
-1
context.c
dlls/wined3d/context.c
+1
-1
drawprim.c
dlls/wined3d/drawprim.c
+1
-1
state.c
dlls/wined3d/state.c
+2
-2
No files found.
dlls/wined3d/basetexture.c
View file @
1183383a
...
...
@@ -425,7 +425,7 @@ void basetexture_apply_state_changes(IWineD3DBaseTexture *iface,
D3DCOLORTOGLFLOAT4
(
state
,
col
);
TRACE
(
"Setting border color for %u to %x
\n
"
,
textureDimensions
,
state
);
glTexParameterfv
(
textureDimensions
,
GL_TEXTURE_BORDER_COLOR
,
&
col
[
0
]);
checkGLcall
(
"glTexParameter
i
(..., GL_TEXTURE_BORDER_COLOR, ...)"
);
checkGLcall
(
"glTexParameter
fv
(..., GL_TEXTURE_BORDER_COLOR, ...)"
);
gl_tex
->
states
[
WINED3DTEXSTA_BORDERCOLOR
]
=
state
;
}
...
...
dlls/wined3d/context.c
View file @
1183383a
...
...
@@ -1758,7 +1758,7 @@ static void SetupForBlit(IWineD3DDeviceImpl *This, struct wined3d_context *conte
glTexEnvf
(
GL_TEXTURE_FILTER_CONTROL_EXT
,
GL_TEXTURE_LOD_BIAS_EXT
,
0
.
0
f
);
checkGLcall
(
"glTexEnv
i
GL_TEXTURE_LOD_BIAS_EXT ..."
);
checkGLcall
(
"glTexEnv
f
GL_TEXTURE_LOD_BIAS_EXT ..."
);
}
if
(
sampler
!=
WINED3D_UNMAPPED_STAGE
)
...
...
dlls/wined3d/drawprim.c
View file @
1183383a
...
...
@@ -842,7 +842,7 @@ HRESULT tesselate_rectpatch(IWineD3DDeviceImpl *This,
glMatrixMode
(
GL_PROJECTION
);
checkGLcall
(
"glMatrixMode(GL_PROJECTION)"
);
glLoadIdentity
();
checkGLcall
(
"glLoadI
n
dentity()"
);
checkGLcall
(
"glLoadIdentity()"
);
glScalef
(
1
.
0
f
/
(
max_x
),
1
.
0
f
/
(
max_y
),
max_z
==
0
.
0
f
?
1
.
0
f
:
1
.
0
f
/
(
2
.
0
f
*
max_z
));
glTranslatef
(
0
.
0
f
,
0
.
0
f
,
0
.
5
f
);
checkGLcall
(
"glScalef"
);
...
...
dlls/wined3d/state.c
View file @
1183383a
...
...
@@ -3656,7 +3656,7 @@ static void sampler(DWORD state_id, IWineD3DStateBlockImpl *stateblock, struct w
glTexEnvf
(
GL_TEXTURE_FILTER_CONTROL_EXT
,
GL_TEXTURE_LOD_BIAS_EXT
,
tmpvalue
.
f
);
checkGLcall
(
"glTexEnv
i
(GL_TEXTURE_LOD_BIAS_EXT, ...)"
);
checkGLcall
(
"glTexEnv
f
(GL_TEXTURE_LOD_BIAS_EXT, ...)"
);
}
if
(
!
use_ps
(
state
)
&&
sampler
<
state
->
lowest_disabled_stage
)
...
...
@@ -4387,7 +4387,7 @@ static void loadVertexData(const struct wined3d_context *context, IWineD3DStateB
{
static
const
GLbyte
one
=
1
;
GL_EXTCALL
(
glWeightbvARB
(
1
,
&
one
));
checkGLcall
(
"glWeight
i
vARB(gl_info->max_blends, weights)"
);
checkGLcall
(
"glWeight
b
vARB(gl_info->max_blends, weights)"
);
}
}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment