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
5d6f2981
Commit
5d6f2981
authored
Jul 03, 2011
by
Henri Verbeet
Committed by
Alexandre Julliard
Jul 04, 2011
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
wined3d: Get rid of the GL_SupportedExt typedef.
parent
82d74d56
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
11 additions
and
8 deletions
+11
-8
directx.c
dlls/wined3d/directx.c
+7
-4
utils.c
dlls/wined3d/utils.c
+1
-1
wined3d_gl.h
dlls/wined3d/wined3d_gl.h
+2
-2
wined3d_private.h
dlls/wined3d/wined3d_private.h
+1
-1
No files found.
dlls/wined3d/directx.c
View file @
5d6f2981
...
@@ -72,11 +72,14 @@ enum wined3d_gl_vendor
...
@@ -72,11 +72,14 @@ enum wined3d_gl_vendor
static
const
GUID
IID_D3DDEVICE_D3DUID
=
{
0xaeb2cdd4
,
0x6e41
,
0x43ea
,
{
0x94
,
0x1c
,
0x83
,
0x61
,
0xcc
,
0x76
,
0x07
,
0x81
}
};
static
const
GUID
IID_D3DDEVICE_D3DUID
=
{
0xaeb2cdd4
,
0x6e41
,
0x43ea
,
{
0x94
,
0x1c
,
0x83
,
0x61
,
0xcc
,
0x76
,
0x07
,
0x81
}
};
/* Extension detection */
/* Extension detection */
static
const
struct
{
static
const
struct
{
const
char
*
extension_string
;
const
char
*
extension_string
;
GL_SupportedExt
extension
;
enum
wined3d_gl_extension
extension
;
DWORD
version
;
DWORD
version
;
}
EXTENSION_MAP
[]
=
{
}
EXTENSION_MAP
[]
=
{
/* APPLE */
/* APPLE */
{
"GL_APPLE_client_storage"
,
APPLE_CLIENT_STORAGE
,
0
},
{
"GL_APPLE_client_storage"
,
APPLE_CLIENT_STORAGE
,
0
},
{
"GL_APPLE_fence"
,
APPLE_FENCE
,
0
},
{
"GL_APPLE_fence"
,
APPLE_FENCE
,
0
},
...
@@ -446,7 +449,7 @@ static inline BOOL test_arb_vs_offset_limit(const struct wined3d_gl_info *gl_inf
...
@@ -446,7 +449,7 @@ static inline BOOL test_arb_vs_offset_limit(const struct wined3d_gl_info *gl_inf
return
ret
;
return
ret
;
}
}
static
DWORD
ver_for_ext
(
GL_SupportedExt
ext
)
static
DWORD
ver_for_ext
(
enum
wined3d_gl_extension
ext
)
{
{
unsigned
int
i
;
unsigned
int
i
;
for
(
i
=
0
;
i
<
(
sizeof
(
EXTENSION_MAP
)
/
sizeof
(
*
EXTENSION_MAP
));
++
i
)
{
for
(
i
=
0
;
i
<
(
sizeof
(
EXTENSION_MAP
)
/
sizeof
(
*
EXTENSION_MAP
));
++
i
)
{
...
...
dlls/wined3d/utils.c
View file @
5d6f2981
...
@@ -249,7 +249,7 @@ struct wined3d_format_texture_info
...
@@ -249,7 +249,7 @@ struct wined3d_format_texture_info
GLint
gl_type
;
GLint
gl_type
;
unsigned
int
conv_byte_count
;
unsigned
int
conv_byte_count
;
unsigned
int
flags
;
unsigned
int
flags
;
GL_SupportedExt
extension
;
enum
wined3d_gl_extension
extension
;
void
(
*
convert
)(
const
BYTE
*
src
,
BYTE
*
dst
,
UINT
pitch
,
UINT
width
,
UINT
height
);
void
(
*
convert
)(
const
BYTE
*
src
,
BYTE
*
dst
,
UINT
pitch
,
UINT
width
,
UINT
height
);
};
};
...
...
dlls/wined3d/wined3d_gl.h
View file @
5d6f2981
...
@@ -1721,7 +1721,7 @@ BOOL (WINAPI *pwglShareLists)(HGLRC, HGLRC) DECLSPEC_HIDDEN;
...
@@ -1721,7 +1721,7 @@ BOOL (WINAPI *pwglShareLists)(HGLRC, HGLRC) DECLSPEC_HIDDEN;
USE_WGL_FUNC(wglShareLists)
USE_WGL_FUNC(wglShareLists)
/* OpenGL extensions. */
/* OpenGL extensions. */
typedef
enum
wined3d_gl_extension
enum
wined3d_gl_extension
{
{
WINED3D_GL_EXT_NONE
,
WINED3D_GL_EXT_NONE
,
...
@@ -1845,7 +1845,7 @@ typedef enum wined3d_gl_extension
...
@@ -1845,7 +1845,7 @@ typedef enum wined3d_gl_extension
WINED3D_GL_VERSION_2_0
,
WINED3D_GL_VERSION_2_0
,
WINED3D_GL_EXT_COUNT
,
WINED3D_GL_EXT_COUNT
,
}
GL_SupportedExt
;
};
/* GL_APPLE_client_storage */
/* GL_APPLE_client_storage */
#ifndef GL_APPLE_client_storage
#ifndef GL_APPLE_client_storage
...
...
dlls/wined3d/wined3d_private.h
View file @
5d6f2981
...
@@ -1139,7 +1139,7 @@ struct StateEntryTemplate
...
@@ -1139,7 +1139,7 @@ struct StateEntryTemplate
{
{
DWORD
state
;
DWORD
state
;
struct
StateEntry
content
;
struct
StateEntry
content
;
GL_SupportedExt
extension
;
enum
wined3d_gl_extension
extension
;
};
};
struct
fragment_caps
struct
fragment_caps
...
...
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