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
c7e3bb5a
Commit
c7e3bb5a
authored
Jul 24, 2012
by
Henri Verbeet
Committed by
Alexandre Julliard
Jul 24, 2012
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
wined3d: Use struct opengl_funcs for storing GL extension pointers.
parent
4f3263e0
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
76 additions
and
77 deletions
+76
-77
directx.c
dlls/wined3d/directx.c
+47
-44
gl_compat.c
dlls/wined3d/gl_compat.c
+20
-20
wined3d_gl.h
dlls/wined3d/wined3d_gl.h
+0
-6
wined3d_private.h
dlls/wined3d/wined3d_private.h
+9
-7
No files found.
dlls/wined3d/directx.c
View file @
c7e3bb5a
...
@@ -2317,7 +2317,7 @@ static void parse_extension_string(struct wined3d_gl_info *gl_info, const char *
...
@@ -2317,7 +2317,7 @@ static void parse_extension_string(struct wined3d_gl_info *gl_info, const char *
static
void
load_gl_funcs
(
struct
wined3d_gl_info
*
gl_info
,
DWORD
gl_version
)
static
void
load_gl_funcs
(
struct
wined3d_gl_info
*
gl_info
,
DWORD
gl_version
)
{
{
#define USE_GL_FUNC(type, pfn, ext
, replace) gl_info->pfn = (type
)pwglGetProcAddress(#pfn);
#define USE_GL_FUNC(type, pfn, ext
_id, replace) gl_info->gl_ops.ext.p_##pfn = (void *
)pwglGetProcAddress(#pfn);
GL_EXT_FUNCS_GEN
;
GL_EXT_FUNCS_GEN
;
WGL_EXT_FUNCS_GEN
;
WGL_EXT_FUNCS_GEN
;
#undef USE_GL_FUNC
#undef USE_GL_FUNC
...
@@ -2604,7 +2604,7 @@ static BOOL wined3d_adapter_init_gl_caps(struct wined3d_adapter *adapter)
...
@@ -2604,7 +2604,7 @@ static BOOL wined3d_adapter_init_gl_caps(struct wined3d_adapter *adapter)
hdc
=
pwglGetCurrentDC
();
hdc
=
pwglGetCurrentDC
();
/* Not all GL drivers might offer WGL extensions e.g. VirtualBox. */
/* Not all GL drivers might offer WGL extensions e.g. VirtualBox. */
if
(
GL_EXTCALL
(
wglGetExtensionsStringARB
))
if
(
GL_EXTCALL
(
wglGetExtensionsStringARB
))
WGL_Extensions
=
GL_EXTCALL
(
wglGetExtensionsStringARB
(
hdc
));
WGL_Extensions
=
(
const
char
*
)
GL_EXTCALL
(
wglGetExtensionsStringARB
(
hdc
));
if
(
!
WGL_Extensions
)
if
(
!
WGL_Extensions
)
WARN
(
"WGL extensions not supported.
\n
"
);
WARN
(
"WGL extensions not supported.
\n
"
);
else
else
...
@@ -2614,16 +2614,16 @@ static BOOL wined3d_adapter_init_gl_caps(struct wined3d_adapter *adapter)
...
@@ -2614,16 +2614,16 @@ static BOOL wined3d_adapter_init_gl_caps(struct wined3d_adapter *adapter)
if
(
!
gl_info
->
supported
[
EXT_TEXTURE3D
]
&&
gl_version
>=
MAKEDWORD_VERSION
(
1
,
2
))
if
(
!
gl_info
->
supported
[
EXT_TEXTURE3D
]
&&
gl_version
>=
MAKEDWORD_VERSION
(
1
,
2
))
{
{
TRACE
(
"GL CORE: GL_EXT_texture3D support.
\n
"
);
TRACE
(
"GL CORE: GL_EXT_texture3D support.
\n
"
);
gl_info
->
glTexImage3DEXT
=
(
void
*
)
pwglGetProcAddress
(
"glTexImage3D"
);
gl_info
->
gl
_ops
.
ext
.
p_gl
TexImage3DEXT
=
(
void
*
)
pwglGetProcAddress
(
"glTexImage3D"
);
gl_info
->
glTexSubImage3DEXT
=
(
void
*
)
pwglGetProcAddress
(
"glTexSubImage3D"
);
gl_info
->
gl
_ops
.
ext
.
p_gl
TexSubImage3DEXT
=
(
void
*
)
pwglGetProcAddress
(
"glTexSubImage3D"
);
gl_info
->
supported
[
EXT_TEXTURE3D
]
=
TRUE
;
gl_info
->
supported
[
EXT_TEXTURE3D
]
=
TRUE
;
}
}
if
(
!
gl_info
->
supported
[
NV_POINT_SPRITE
]
&&
gl_version
>=
MAKEDWORD_VERSION
(
1
,
4
))
if
(
!
gl_info
->
supported
[
NV_POINT_SPRITE
]
&&
gl_version
>=
MAKEDWORD_VERSION
(
1
,
4
))
{
{
TRACE
(
"GL CORE: GL_NV_point_sprite support.
\n
"
);
TRACE
(
"GL CORE: GL_NV_point_sprite support.
\n
"
);
gl_info
->
glPointParameterivNV
=
(
void
*
)
pwglGetProcAddress
(
"glPointParameteriv"
);
gl_info
->
gl
_ops
.
ext
.
p_gl
PointParameterivNV
=
(
void
*
)
pwglGetProcAddress
(
"glPointParameteriv"
);
gl_info
->
glPointParameteriNV
=
(
void
*
)
pwglGetProcAddress
(
"glPointParameteri"
);
gl_info
->
gl
_ops
.
ext
.
p_gl
PointParameteriNV
=
(
void
*
)
pwglGetProcAddress
(
"glPointParameteri"
);
gl_info
->
supported
[
NV_POINT_SPRITE
]
=
TRUE
;
gl_info
->
supported
[
NV_POINT_SPRITE
]
=
TRUE
;
}
}
...
@@ -2759,47 +2759,49 @@ static BOOL wined3d_adapter_init_gl_caps(struct wined3d_adapter *adapter)
...
@@ -2759,47 +2759,49 @@ static BOOL wined3d_adapter_init_gl_caps(struct wined3d_adapter *adapter)
if
(
gl_info
->
supported
[
ARB_FRAMEBUFFER_OBJECT
])
if
(
gl_info
->
supported
[
ARB_FRAMEBUFFER_OBJECT
])
{
{
gl_info
->
fbo_ops
.
glIsRenderbuffer
=
gl_info
->
glIsRenderbuffer
;
gl_info
->
fbo_ops
.
glIsRenderbuffer
=
gl_info
->
gl_ops
.
ext
.
p_glIsRenderbuffer
;
gl_info
->
fbo_ops
.
glBindRenderbuffer
=
gl_info
->
glBindRenderbuffer
;
gl_info
->
fbo_ops
.
glBindRenderbuffer
=
gl_info
->
gl_ops
.
ext
.
p_glBindRenderbuffer
;
gl_info
->
fbo_ops
.
glDeleteRenderbuffers
=
gl_info
->
glDeleteRenderbuffers
;
gl_info
->
fbo_ops
.
glDeleteRenderbuffers
=
gl_info
->
gl_ops
.
ext
.
p_glDeleteRenderbuffers
;
gl_info
->
fbo_ops
.
glGenRenderbuffers
=
gl_info
->
glGenRenderbuffers
;
gl_info
->
fbo_ops
.
glGenRenderbuffers
=
gl_info
->
gl_ops
.
ext
.
p_glGenRenderbuffers
;
gl_info
->
fbo_ops
.
glRenderbufferStorage
=
gl_info
->
glRenderbufferStorage
;
gl_info
->
fbo_ops
.
glRenderbufferStorage
=
gl_info
->
gl_ops
.
ext
.
p_glRenderbufferStorage
;
gl_info
->
fbo_ops
.
glRenderbufferStorageMultisample
=
gl_info
->
glRenderbufferStorageMultisample
;
gl_info
->
fbo_ops
.
glRenderbufferStorageMultisample
=
gl_info
->
gl_ops
.
ext
.
p_glRenderbufferStorageMultisample
;
gl_info
->
fbo_ops
.
glGetRenderbufferParameteriv
=
gl_info
->
glGetRenderbufferParameteriv
;
gl_info
->
fbo_ops
.
glGetRenderbufferParameteriv
=
gl_info
->
gl_ops
.
ext
.
p_glGetRenderbufferParameteriv
;
gl_info
->
fbo_ops
.
glIsFramebuffer
=
gl_info
->
glIsFramebuffer
;
gl_info
->
fbo_ops
.
glIsFramebuffer
=
gl_info
->
gl_ops
.
ext
.
p_glIsFramebuffer
;
gl_info
->
fbo_ops
.
glBindFramebuffer
=
gl_info
->
glBindFramebuffer
;
gl_info
->
fbo_ops
.
glBindFramebuffer
=
gl_info
->
gl_ops
.
ext
.
p_glBindFramebuffer
;
gl_info
->
fbo_ops
.
glDeleteFramebuffers
=
gl_info
->
glDeleteFramebuffers
;
gl_info
->
fbo_ops
.
glDeleteFramebuffers
=
gl_info
->
gl_ops
.
ext
.
p_glDeleteFramebuffers
;
gl_info
->
fbo_ops
.
glGenFramebuffers
=
gl_info
->
glGenFramebuffers
;
gl_info
->
fbo_ops
.
glGenFramebuffers
=
gl_info
->
gl_ops
.
ext
.
p_glGenFramebuffers
;
gl_info
->
fbo_ops
.
glCheckFramebufferStatus
=
gl_info
->
glCheckFramebufferStatus
;
gl_info
->
fbo_ops
.
glCheckFramebufferStatus
=
gl_info
->
gl_ops
.
ext
.
p_glCheckFramebufferStatus
;
gl_info
->
fbo_ops
.
glFramebufferTexture1D
=
gl_info
->
glFramebufferTexture1D
;
gl_info
->
fbo_ops
.
glFramebufferTexture1D
=
gl_info
->
gl_ops
.
ext
.
p_glFramebufferTexture1D
;
gl_info
->
fbo_ops
.
glFramebufferTexture2D
=
gl_info
->
glFramebufferTexture2D
;
gl_info
->
fbo_ops
.
glFramebufferTexture2D
=
gl_info
->
gl_ops
.
ext
.
p_glFramebufferTexture2D
;
gl_info
->
fbo_ops
.
glFramebufferTexture3D
=
gl_info
->
glFramebufferTexture3D
;
gl_info
->
fbo_ops
.
glFramebufferTexture3D
=
gl_info
->
gl_ops
.
ext
.
p_glFramebufferTexture3D
;
gl_info
->
fbo_ops
.
glFramebufferRenderbuffer
=
gl_info
->
glFramebufferRenderbuffer
;
gl_info
->
fbo_ops
.
glFramebufferRenderbuffer
=
gl_info
->
gl_ops
.
ext
.
p_glFramebufferRenderbuffer
;
gl_info
->
fbo_ops
.
glGetFramebufferAttachmentParameteriv
=
gl_info
->
glGetFramebufferAttachmentParameteriv
;
gl_info
->
fbo_ops
.
glGetFramebufferAttachmentParameteriv
gl_info
->
fbo_ops
.
glBlitFramebuffer
=
gl_info
->
glBlitFramebuffer
;
=
gl_info
->
gl_ops
.
ext
.
p_glGetFramebufferAttachmentParameteriv
;
gl_info
->
fbo_ops
.
glGenerateMipmap
=
gl_info
->
glGenerateMipmap
;
gl_info
->
fbo_ops
.
glBlitFramebuffer
=
gl_info
->
gl_ops
.
ext
.
p_glBlitFramebuffer
;
gl_info
->
fbo_ops
.
glGenerateMipmap
=
gl_info
->
gl_ops
.
ext
.
p_glGenerateMipmap
;
}
}
else
else
{
{
if
(
gl_info
->
supported
[
EXT_FRAMEBUFFER_OBJECT
])
if
(
gl_info
->
supported
[
EXT_FRAMEBUFFER_OBJECT
])
{
{
gl_info
->
fbo_ops
.
glIsRenderbuffer
=
gl_info
->
glIsRenderbufferEXT
;
gl_info
->
fbo_ops
.
glIsRenderbuffer
=
gl_info
->
gl_ops
.
ext
.
p_glIsRenderbufferEXT
;
gl_info
->
fbo_ops
.
glBindRenderbuffer
=
gl_info
->
glBindRenderbufferEXT
;
gl_info
->
fbo_ops
.
glBindRenderbuffer
=
gl_info
->
gl_ops
.
ext
.
p_glBindRenderbufferEXT
;
gl_info
->
fbo_ops
.
glDeleteRenderbuffers
=
gl_info
->
glDeleteRenderbuffersEXT
;
gl_info
->
fbo_ops
.
glDeleteRenderbuffers
=
gl_info
->
gl_ops
.
ext
.
p_glDeleteRenderbuffersEXT
;
gl_info
->
fbo_ops
.
glGenRenderbuffers
=
gl_info
->
glGenRenderbuffersEXT
;
gl_info
->
fbo_ops
.
glGenRenderbuffers
=
gl_info
->
gl_ops
.
ext
.
p_glGenRenderbuffersEXT
;
gl_info
->
fbo_ops
.
glRenderbufferStorage
=
gl_info
->
glRenderbufferStorageEXT
;
gl_info
->
fbo_ops
.
glRenderbufferStorage
=
gl_info
->
gl_ops
.
ext
.
p_glRenderbufferStorageEXT
;
gl_info
->
fbo_ops
.
glGetRenderbufferParameteriv
=
gl_info
->
glGetRenderbufferParameterivEXT
;
gl_info
->
fbo_ops
.
glGetRenderbufferParameteriv
=
gl_info
->
gl_ops
.
ext
.
p_glGetRenderbufferParameterivEXT
;
gl_info
->
fbo_ops
.
glIsFramebuffer
=
gl_info
->
glIsFramebufferEXT
;
gl_info
->
fbo_ops
.
glIsFramebuffer
=
gl_info
->
gl_ops
.
ext
.
p_glIsFramebufferEXT
;
gl_info
->
fbo_ops
.
glBindFramebuffer
=
gl_info
->
glBindFramebufferEXT
;
gl_info
->
fbo_ops
.
glBindFramebuffer
=
gl_info
->
gl_ops
.
ext
.
p_glBindFramebufferEXT
;
gl_info
->
fbo_ops
.
glDeleteFramebuffers
=
gl_info
->
glDeleteFramebuffersEXT
;
gl_info
->
fbo_ops
.
glDeleteFramebuffers
=
gl_info
->
gl_ops
.
ext
.
p_glDeleteFramebuffersEXT
;
gl_info
->
fbo_ops
.
glGenFramebuffers
=
gl_info
->
glGenFramebuffersEXT
;
gl_info
->
fbo_ops
.
glGenFramebuffers
=
gl_info
->
gl_ops
.
ext
.
p_glGenFramebuffersEXT
;
gl_info
->
fbo_ops
.
glCheckFramebufferStatus
=
gl_info
->
glCheckFramebufferStatusEXT
;
gl_info
->
fbo_ops
.
glCheckFramebufferStatus
=
gl_info
->
gl_ops
.
ext
.
p_glCheckFramebufferStatusEXT
;
gl_info
->
fbo_ops
.
glFramebufferTexture1D
=
gl_info
->
glFramebufferTexture1DEXT
;
gl_info
->
fbo_ops
.
glFramebufferTexture1D
=
gl_info
->
gl_ops
.
ext
.
p_glFramebufferTexture1DEXT
;
gl_info
->
fbo_ops
.
glFramebufferTexture2D
=
gl_info
->
glFramebufferTexture2DEXT
;
gl_info
->
fbo_ops
.
glFramebufferTexture2D
=
gl_info
->
gl_ops
.
ext
.
p_glFramebufferTexture2DEXT
;
gl_info
->
fbo_ops
.
glFramebufferTexture3D
=
gl_info
->
glFramebufferTexture3DEXT
;
gl_info
->
fbo_ops
.
glFramebufferTexture3D
=
gl_info
->
gl_ops
.
ext
.
p_glFramebufferTexture3DEXT
;
gl_info
->
fbo_ops
.
glFramebufferRenderbuffer
=
gl_info
->
glFramebufferRenderbufferEXT
;
gl_info
->
fbo_ops
.
glFramebufferRenderbuffer
=
gl_info
->
gl_ops
.
ext
.
p_glFramebufferRenderbufferEXT
;
gl_info
->
fbo_ops
.
glGetFramebufferAttachmentParameteriv
=
gl_info
->
glGetFramebufferAttachmentParameterivEXT
;
gl_info
->
fbo_ops
.
glGetFramebufferAttachmentParameteriv
gl_info
->
fbo_ops
.
glGenerateMipmap
=
gl_info
->
glGenerateMipmapEXT
;
=
gl_info
->
gl_ops
.
ext
.
p_glGetFramebufferAttachmentParameterivEXT
;
gl_info
->
fbo_ops
.
glGenerateMipmap
=
gl_info
->
gl_ops
.
ext
.
p_glGenerateMipmapEXT
;
}
}
else
if
(
wined3d_settings
.
offscreen_rendering_mode
==
ORM_FBO
)
else
if
(
wined3d_settings
.
offscreen_rendering_mode
==
ORM_FBO
)
{
{
...
@@ -2808,11 +2810,12 @@ static BOOL wined3d_adapter_init_gl_caps(struct wined3d_adapter *adapter)
...
@@ -2808,11 +2810,12 @@ static BOOL wined3d_adapter_init_gl_caps(struct wined3d_adapter *adapter)
}
}
if
(
gl_info
->
supported
[
EXT_FRAMEBUFFER_BLIT
])
if
(
gl_info
->
supported
[
EXT_FRAMEBUFFER_BLIT
])
{
{
gl_info
->
fbo_ops
.
glBlitFramebuffer
=
gl_info
->
glBlitFramebufferEXT
;
gl_info
->
fbo_ops
.
glBlitFramebuffer
=
gl_info
->
gl
_ops
.
ext
.
p_gl
BlitFramebufferEXT
;
}
}
if
(
gl_info
->
supported
[
EXT_FRAMEBUFFER_MULTISAMPLE
])
if
(
gl_info
->
supported
[
EXT_FRAMEBUFFER_MULTISAMPLE
])
{
{
gl_info
->
fbo_ops
.
glRenderbufferStorageMultisample
=
gl_info
->
glRenderbufferStorageMultisampleEXT
;
gl_info
->
fbo_ops
.
glRenderbufferStorageMultisample
=
gl_info
->
gl_ops
.
ext
.
p_glRenderbufferStorageMultisampleEXT
;
}
}
}
}
...
...
dlls/wined3d/gl_compat.c
View file @
c7e3bb5a
...
@@ -350,18 +350,18 @@ void add_gl_compat_wrappers(struct wined3d_gl_info *gl_info)
...
@@ -350,18 +350,18 @@ void add_gl_compat_wrappers(struct wined3d_gl_info *gl_info)
if
(
!
gl_info
->
supported
[
ARB_MULTITEXTURE
])
if
(
!
gl_info
->
supported
[
ARB_MULTITEXTURE
])
{
{
TRACE
(
"Applying GL_ARB_multitexture emulation hooks
\n
"
);
TRACE
(
"Applying GL_ARB_multitexture emulation hooks
\n
"
);
gl_info
->
gl
ActiveTextureARB
=
wine_glActiveTextureARB
;
gl_info
->
gl
_ops
.
ext
.
p_glActiveTextureARB
=
wine_glActiveTextureARB
;
gl_info
->
gl
ClientActiveTextureARB
=
wine_glClientActiveTextureARB
;
gl_info
->
gl
_ops
.
ext
.
p_glClientActiveTextureARB
=
wine_glClientActiveTextureARB
;
gl_info
->
gl
MultiTexCoord1fARB
=
wine_glMultiTexCoord1fARB
;
gl_info
->
gl
_ops
.
ext
.
p_glMultiTexCoord1fARB
=
wine_glMultiTexCoord1fARB
;
gl_info
->
gl
MultiTexCoord1fvARB
=
wine_glMultiTexCoord1fvARB
;
gl_info
->
gl
_ops
.
ext
.
p_glMultiTexCoord1fvARB
=
wine_glMultiTexCoord1fvARB
;
gl_info
->
gl
MultiTexCoord2fARB
=
wine_glMultiTexCoord2fARB
;
gl_info
->
gl
_ops
.
ext
.
p_glMultiTexCoord2fARB
=
wine_glMultiTexCoord2fARB
;
gl_info
->
gl
MultiTexCoord2fvARB
=
wine_glMultiTexCoord2fvARB
;
gl_info
->
gl
_ops
.
ext
.
p_glMultiTexCoord2fvARB
=
wine_glMultiTexCoord2fvARB
;
gl_info
->
gl
MultiTexCoord3fARB
=
wine_glMultiTexCoord3fARB
;
gl_info
->
gl
_ops
.
ext
.
p_glMultiTexCoord3fARB
=
wine_glMultiTexCoord3fARB
;
gl_info
->
gl
MultiTexCoord3fvARB
=
wine_glMultiTexCoord3fvARB
;
gl_info
->
gl
_ops
.
ext
.
p_glMultiTexCoord3fvARB
=
wine_glMultiTexCoord3fvARB
;
gl_info
->
gl
MultiTexCoord4fARB
=
wine_glMultiTexCoord4fARB
;
gl_info
->
gl
_ops
.
ext
.
p_glMultiTexCoord4fARB
=
wine_glMultiTexCoord4fARB
;
gl_info
->
gl
MultiTexCoord4fvARB
=
wine_glMultiTexCoord4fvARB
;
gl_info
->
gl
_ops
.
ext
.
p_glMultiTexCoord4fvARB
=
wine_glMultiTexCoord4fvARB
;
gl_info
->
gl
MultiTexCoord2svARB
=
wine_glMultiTexCoord2svARB
;
gl_info
->
gl
_ops
.
ext
.
p_glMultiTexCoord2svARB
=
wine_glMultiTexCoord2svARB
;
gl_info
->
gl
MultiTexCoord4svARB
=
wine_glMultiTexCoord4svARB
;
gl_info
->
gl
_ops
.
ext
.
p_glMultiTexCoord4svARB
=
wine_glMultiTexCoord4svARB
;
if
(
old_multitex_glGetIntegerv
)
{
if
(
old_multitex_glGetIntegerv
)
{
FIXME
(
"GL_ARB_multitexture glGetIntegerv hook already applied
\n
"
);
FIXME
(
"GL_ARB_multitexture glGetIntegerv hook already applied
\n
"
);
}
else
{
}
else
{
...
@@ -516,26 +516,26 @@ void add_gl_compat_wrappers(struct wined3d_gl_info *gl_info)
...
@@ -516,26 +516,26 @@ void add_gl_compat_wrappers(struct wined3d_gl_info *gl_info)
if
(
old_fogcoord_glFogCoordfEXT
)
{
if
(
old_fogcoord_glFogCoordfEXT
)
{
FIXME
(
"GL_EXT_fogcoord glFogCoordfEXT hook already applied
\n
"
);
FIXME
(
"GL_EXT_fogcoord glFogCoordfEXT hook already applied
\n
"
);
}
else
{
}
else
{
old_fogcoord_glFogCoordfEXT
=
gl_info
->
glFogCoordfEXT
;
old_fogcoord_glFogCoordfEXT
=
gl_info
->
gl
_ops
.
ext
.
p_gl
FogCoordfEXT
;
gl_info
->
glFogCoordfEXT
=
wine_glFogCoordfEXT
;
gl_info
->
gl
_ops
.
ext
.
p_gl
FogCoordfEXT
=
wine_glFogCoordfEXT
;
}
}
if
(
old_fogcoord_glFogCoordfvEXT
)
{
if
(
old_fogcoord_glFogCoordfvEXT
)
{
FIXME
(
"GL_EXT_fogcoord glFogCoordfvEXT hook already applied
\n
"
);
FIXME
(
"GL_EXT_fogcoord glFogCoordfvEXT hook already applied
\n
"
);
}
else
{
}
else
{
old_fogcoord_glFogCoordfvEXT
=
gl_info
->
glFogCoordfvEXT
;
old_fogcoord_glFogCoordfvEXT
=
gl_info
->
gl
_ops
.
ext
.
p_gl
FogCoordfvEXT
;
gl_info
->
glFogCoordfvEXT
=
wine_glFogCoordfvEXT
;
gl_info
->
gl
_ops
.
ext
.
p_gl
FogCoordfvEXT
=
wine_glFogCoordfvEXT
;
}
}
if
(
old_fogcoord_glFogCoorddEXT
)
{
if
(
old_fogcoord_glFogCoorddEXT
)
{
FIXME
(
"GL_EXT_fogcoord glFogCoorddEXT hook already applied
\n
"
);
FIXME
(
"GL_EXT_fogcoord glFogCoorddEXT hook already applied
\n
"
);
}
else
{
}
else
{
old_fogcoord_glFogCoorddEXT
=
gl_info
->
glFogCoorddEXT
;
old_fogcoord_glFogCoorddEXT
=
gl_info
->
gl
_ops
.
ext
.
p_gl
FogCoorddEXT
;
gl_info
->
glFogCoorddEXT
=
wine_glFogCoorddEXT
;
gl_info
->
gl
_ops
.
ext
.
p_gl
FogCoorddEXT
=
wine_glFogCoorddEXT
;
}
}
if
(
old_fogcoord_glFogCoorddvEXT
)
{
if
(
old_fogcoord_glFogCoorddvEXT
)
{
FIXME
(
"GL_EXT_fogcoord glFogCoorddvEXT hook already applied
\n
"
);
FIXME
(
"GL_EXT_fogcoord glFogCoorddvEXT hook already applied
\n
"
);
}
else
{
}
else
{
old_fogcoord_glFogCoorddvEXT
=
gl_info
->
glFogCoorddvEXT
;
old_fogcoord_glFogCoorddvEXT
=
gl_info
->
gl
_ops
.
ext
.
p_gl
FogCoorddvEXT
;
gl_info
->
glFogCoorddvEXT
=
wine_glFogCoorddvEXT
;
gl_info
->
gl
_ops
.
ext
.
p_gl
FogCoorddvEXT
=
wine_glFogCoorddvEXT
;
}
}
gl_info
->
supported
[
EXT_FOG_COORD
]
=
TRUE
;
gl_info
->
supported
[
EXT_FOG_COORD
]
=
TRUE
;
}
}
...
...
dlls/wined3d/wined3d_gl.h
View file @
c7e3bb5a
...
@@ -46,12 +46,6 @@
...
@@ -46,12 +46,6 @@
#ifndef __WINE_WINED3D_GL_H
#ifndef __WINE_WINED3D_GL_H
#define __WINE_WINED3D_GL_H
#define __WINE_WINED3D_GL_H
#ifdef USE_WIN32_OPENGL
#define WINE_GLAPI __stdcall
#else
#define WINE_GLAPI
#endif
/****************************************************
/****************************************************
* OpenGL 1.0/1.1/1.2/1.3
* OpenGL 1.0/1.1/1.2/1.3
* types, #defines and function pointers
* types, #defines and function pointers
...
...
dlls/wined3d/wined3d_private.h
View file @
c7e3bb5a
...
@@ -24,6 +24,12 @@
...
@@ -24,6 +24,12 @@
#ifndef __WINE_WINED3D_PRIVATE_H
#ifndef __WINE_WINED3D_PRIVATE_H
#define __WINE_WINED3D_PRIVATE_H
#define __WINE_WINED3D_PRIVATE_H
#ifdef USE_WIN32_OPENGL
#define WINE_GLAPI __stdcall
#else
#define WINE_GLAPI
#endif
#include <stdarg.h>
#include <stdarg.h>
#include <math.h>
#include <math.h>
#include <limits.h>
#include <limits.h>
...
@@ -43,6 +49,7 @@
...
@@ -43,6 +49,7 @@
#include "wined3d_gl.h"
#include "wined3d_gl.h"
#include "wine/list.h"
#include "wine/list.h"
#include "wine/rbtree.h"
#include "wine/rbtree.h"
#include "wine/wgl_driver.h"
/* Driver quirks */
/* Driver quirks */
#define WINED3D_QUIRK_ARB_VS_OFFSET_LIMIT 0x00000001
#define WINED3D_QUIRK_ARB_VS_OFFSET_LIMIT 0x00000001
...
@@ -799,7 +806,7 @@ extern int num_lock DECLSPEC_HIDDEN;
...
@@ -799,7 +806,7 @@ extern int num_lock DECLSPEC_HIDDEN;
/* GL related defines */
/* GL related defines */
/* ------------------ */
/* ------------------ */
#define GL_EXTCALL(f) (gl_info->f)
#define GL_EXTCALL(f) (gl_info->
gl_ops.ext.p_##
f)
#define D3DCOLOR_B_R(dw) (((dw) >> 16) & 0xff)
#define D3DCOLOR_B_R(dw) (((dw) >> 16) & 0xff)
#define D3DCOLOR_B_G(dw) (((dw) >> 8) & 0xff)
#define D3DCOLOR_B_G(dw) (((dw) >> 8) & 0xff)
...
@@ -1503,13 +1510,8 @@ struct wined3d_gl_info
...
@@ -1503,13 +1510,8 @@ struct wined3d_gl_info
BOOL
supported
[
WINED3D_GL_EXT_COUNT
];
BOOL
supported
[
WINED3D_GL_EXT_COUNT
];
GLint
wrap_lookup
[
WINED3D_TADDRESS_MIRROR_ONCE
-
WINED3D_TADDRESS_WRAP
+
1
];
GLint
wrap_lookup
[
WINED3D_TADDRESS_MIRROR_ONCE
-
WINED3D_TADDRESS_WRAP
+
1
];
struct
opengl_funcs
gl_ops
;
struct
wined3d_fbo_ops
fbo_ops
;
struct
wined3d_fbo_ops
fbo_ops
;
#define USE_GL_FUNC(type, pfn, ext, replace) type pfn;
/* GL function pointers */
GL_EXT_FUNCS_GEN
/* WGL function pointers */
WGL_EXT_FUNCS_GEN
#undef USE_GL_FUNC
struct
wined3d_format
*
formats
;
struct
wined3d_format
*
formats
;
};
};
...
...
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