Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
W
wine-cw
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-cw
Commits
f8ed06ea
Commit
f8ed06ea
authored
Mar 02, 2006
by
Roderick Colenbrander
Committed by
Alexandre Julliard
Mar 02, 2006
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
wined3d: Opengl 2.x compile fix.
parent
e96f03a1
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
17 additions
and
5 deletions
+17
-5
device.c
dlls/wined3d/device.c
+11
-4
wined3d_gl.h
include/wine/wined3d_gl.h
+6
-1
No files found.
dlls/wined3d/device.c
View file @
f8ed06ea
...
...
@@ -3767,8 +3767,12 @@ HRESULT WINAPI IWineD3DDeviceImpl_SetRenderState(IWineD3DDevice *iface, D3DRENDE
}
if
(
!
This
->
stateBlock
->
renderState
[
WINED3DRS_TWOSIDEDSTENCILMODE
])
{
glStencilOpSeparate
(
GL_BACK
,
stencilFail
,
depthFail
,
stencilPass
);
checkGLcall
(
"glStencilOpSeparate(GL_BACK,...)"
);
if
(
GL_EXTCALL
(
glStencilOpSeparate
))
{
GL_EXTCALL
(
glStencilOpSeparate
(
GL_BACK
,
stencilFail
,
depthFail
,
stencilPass
));
checkGLcall
(
"glStencilOpSeparate(GL_BACK,...)"
);
}
else
{
WARN
(
"Unsupported in local OpenGL implementation: glStencilOpSeparate
\n
"
);
}
}
else
{
glStencilOp
(
stencilFail
,
depthFail
,
stencilPass
);
checkGLcall
(
"glStencilOp(...)"
);
...
...
@@ -3796,8 +3800,11 @@ HRESULT WINAPI IWineD3DDeviceImpl_SetRenderState(IWineD3DDevice *iface, D3DRENDE
}
This
->
stencilfunc
=
func
;
if
(
!
This
->
stateBlock
->
renderState
[
WINED3DRS_TWOSIDEDSTENCILMODE
])
{
glStencilFuncSeparate
(
GL_BACK
,
func
,
ref
,
mask
);
checkGLcall
(
"glStencilFuncSeparate(GL_BACK,...)"
);
if
(
GL_EXTCALL
(
glStencilFuncSeparate
))
{
GL_EXTCALL
(
glStencilFuncSeparate
(
GL_BACK
,
func
,
ref
,
mask
));
checkGLcall
(
"glStencilOpSeparate(GL_BACK,...)"
);
}
else
WARN
(
"Unsupported in local OpenGL implementation: glStencilFuncSeparate
\n
"
);
}
else
{
glStencilFunc
(
func
,
ref
,
mask
);
checkGLcall
(
"glStencilFunc(...)"
);
...
...
include/wine/wined3d_gl.h
View file @
f8ed06ea
...
...
@@ -803,7 +803,9 @@ typedef void (APIENTRY * PGLFNBEGINOCCLUSIONQUERYNVPROC) (GLuint id);
typedef
void
(
APIENTRY
*
PGLFNENDOCCLUSIONQUERYNVPROC
)
(
void
);
typedef
void
(
APIENTRY
*
PGLFNGETOCCLUSIONQUERYIVNVPROC
)
(
GLuint
id
,
GLenum
pname
,
GLint
*
params
);
typedef
void
(
APIENTRY
*
PGLFNGETOCCLUSIONQUERYUIVNVPROC
)
(
GLuint
id
,
GLenum
pname
,
GLuint
*
params
);
/* OpenGL 2.0 */
typedef
void
(
APIENTRY
*
PGLFNSTENCILOPSEPARATEPROC
)
(
GLenum
face
,
GLenum
sfail
,
GLenum
dpfail
,
GLenum
dppass
);
typedef
void
(
APIENTRY
*
PGLFNSTENCILFUNCSEPARATEPROC
)
(
GLenum
face
,
GLenum
func
,
GLint
ref
,
GLuint
mask
);
/****************************************************
* OpenGL Official Version
...
...
@@ -1032,6 +1034,9 @@ typedef enum _GL_SupportedExt {
USE_GL_FUNC(PGLFNVERTEXATTRIBPOINTERARBPROC, glVertexAttribPointerARB); \
USE_GL_FUNC(PGLFNENABLEVERTEXATTRIBARRAYARBPROC, glEnableVertexAttribArrayARB); \
USE_GL_FUNC(PGLFNDISABLEVERTEXATTRIBARRAYARBPROC, glDisableVertexAttribArrayARB); \
/* OpenGL 2.0 */
\
USE_GL_FUNC(PGLFNSTENCILOPSEPARATEPROC, glStencilOpSeparate); \
USE_GL_FUNC(PGLFNSTENCILFUNCSEPARATEPROC, glStencilFuncSeparate); \
#define GLX_EXT_FUNCS_GEN \
/** GLX_VERSION_1_3 **/
\
...
...
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