Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
wine
Manage
Activity
Members
Labels
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Package registry
Container Registry
Model registry
Operate
Terraform modules
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Zsolt Vadász
wine
Commits
1811e198
Commit
1811e198
authored
20 years ago
by
Christian Costa
Committed by
Alexandre Julliard
20 years ago
Browse files
Options
Downloads
Patches
Plain Diff
Converted some FIXMEs into TRACEs.
parent
c401aa84
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
dlls/d3d8/directx.c
+34
-34
34 additions, 34 deletions
dlls/d3d8/directx.c
with
34 additions
and
34 deletions
dlls/d3d8/directx.c
+
34
−
34
View file @
1811e198
...
...
@@ -293,7 +293,7 @@ HRESULT WINAPI IDirect3D8Impl_CheckDeviceFormat (LPDIRECT3D8 iface,
UINT
Adapter
,
D3DDEVTYPE
DeviceType
,
D3DFORMAT
AdapterFormat
,
DWORD
Usage
,
D3DRESOURCETYPE
RType
,
D3DFORMAT
CheckFormat
)
{
ICOM_THIS
(
IDirect3D8Impl
,
iface
);
FIXM
E
(
"(%p)->(Adptr:%d, DevType:(%u,%s), AdptFmt:(%u,%s), Use:(%lu,%s), ResTyp:(%x,%s), CheckFmt:(%u,%s))
\n
"
,
TRAC
E
(
"(%p)->(Adptr:%d, DevType:(%u,%s), AdptFmt:(%u,%s), Use:(%lu,%s), ResTyp:(%x,%s), CheckFmt:(%u,%s))
\n
"
,
This
,
Adapter
,
DeviceType
,
debug_d3ddevicetype
(
DeviceType
),
...
...
@@ -746,7 +746,7 @@ static void IDirect3D8Impl_FillGLCaps(LPDIRECT3D8 iface, Display* display) {
/* Parse the gl supported features, in theory enabling parts of our code appropriately */
GL_Extensions
=
glGetString
(
GL_EXTENSIONS
);
FIXM
E
(
"GL_Extensions reported:
\n
"
);
TRAC
E
(
"GL_Extensions reported:
\n
"
);
if
(
NULL
==
GL_Extensions
)
{
ERR
(
" GL_Extensions returns NULL
\n
"
);
...
...
@@ -760,105 +760,105 @@ static void IDirect3D8Impl_FillGLCaps(LPDIRECT3D8 iface, Display* display) {
GL_Extensions
++
;
}
memcpy
(
ThisExtn
,
Start
,
(
GL_Extensions
-
Start
));
FIXM
E
(
"- %s
\n
"
,
ThisExtn
);
TRAC
E
(
"- %s
\n
"
,
ThisExtn
);
/**
* ARB
*/
if
(
strcmp
(
ThisExtn
,
"GL_ARB_fragment_program"
)
==
0
)
{
This
->
gl_info
.
ps_arb_version
=
PS_VERSION_11
;
FIXM
E
(
" FOUND: ARB Pixel Shader support - version=%02x
\n
"
,
This
->
gl_info
.
ps_arb_version
);
TRAC
E
(
" FOUND: ARB Pixel Shader support - version=%02x
\n
"
,
This
->
gl_info
.
ps_arb_version
);
This
->
gl_info
.
supported
[
ARB_FRAGMENT_PROGRAM
]
=
TRUE
;
}
else
if
(
strcmp
(
ThisExtn
,
"GL_ARB_multisample"
)
==
0
)
{
FIXM
E
(
" FOUND: ARB Multisample support
\n
"
);
TRAC
E
(
" FOUND: ARB Multisample support
\n
"
);
This
->
gl_info
.
supported
[
ARB_MULTISAMPLE
]
=
TRUE
;
}
else
if
(
strcmp
(
ThisExtn
,
"GL_ARB_multitexture"
)
==
0
)
{
glGetIntegerv
(
GL_MAX_TEXTURE_UNITS_ARB
,
&
gl_max
);
FIXM
E
(
" FOUND: ARB Multitexture support - GL_MAX_TEXTURE_UNITS_ARB=%u
\n
"
,
gl_max
);
TRAC
E
(
" FOUND: ARB Multitexture support - GL_MAX_TEXTURE_UNITS_ARB=%u
\n
"
,
gl_max
);
This
->
gl_info
.
supported
[
ARB_MULTITEXTURE
]
=
TRUE
;
This
->
gl_info
.
max_textures
=
min
(
8
,
gl_max
);
}
else
if
(
strcmp
(
ThisExtn
,
"GL_ARB_texture_cube_map"
)
==
0
)
{
FIXM
E
(
" FOUND: ARB Texture Cube Map support
\n
"
);
TRAC
E
(
" FOUND: ARB Texture Cube Map support
\n
"
);
This
->
gl_info
.
supported
[
ARB_TEXTURE_CUBE_MAP
]
=
TRUE
;
}
else
if
(
strcmp
(
ThisExtn
,
"GL_ARB_texture_compression"
)
==
0
)
{
FIXM
E
(
" FOUND: ARB Texture Compression support
\n
"
);
TRAC
E
(
" FOUND: ARB Texture Compression support
\n
"
);
This
->
gl_info
.
supported
[
ARB_TEXTURE_COMPRESSION
]
=
TRUE
;
}
else
if
(
strcmp
(
ThisExtn
,
"GL_ARB_texture_env_add"
)
==
0
)
{
FIXM
E
(
" FOUND: ARB Texture Env Add support
\n
"
);
TRAC
E
(
" FOUND: ARB Texture Env Add support
\n
"
);
This
->
gl_info
.
supported
[
ARB_TEXTURE_ENV_ADD
]
=
TRUE
;
}
else
if
(
strcmp
(
ThisExtn
,
"GL_ARB_texture_env_combine"
)
==
0
)
{
FIXM
E
(
" FOUND: ARB Texture Env combine support
\n
"
);
TRAC
E
(
" FOUND: ARB Texture Env combine support
\n
"
);
This
->
gl_info
.
supported
[
ARB_TEXTURE_ENV_COMBINE
]
=
TRUE
;
}
else
if
(
strcmp
(
ThisExtn
,
"GL_ARB_texture_env_dot3"
)
==
0
)
{
FIXM
E
(
" FOUND: ARB Dot3 support
\n
"
);
TRAC
E
(
" FOUND: ARB Dot3 support
\n
"
);
This
->
gl_info
.
supported
[
ARB_TEXTURE_ENV_DOT3
]
=
TRUE
;
}
else
if
(
strcmp
(
ThisExtn
,
"GL_ARB_texture_border_clamp"
)
==
0
)
{
FIXM
E
(
" FOUND: ARB Texture border clamp support
\n
"
);
TRAC
E
(
" FOUND: ARB Texture border clamp support
\n
"
);
This
->
gl_info
.
supported
[
ARB_TEXTURE_BORDER_CLAMP
]
=
TRUE
;
}
else
if
(
strcmp
(
ThisExtn
,
"GL_ARB_texture_mirrored_repeat"
)
==
0
)
{
FIXM
E
(
" FOUND: ARB Texture mirrored repeat support
\n
"
);
TRAC
E
(
" FOUND: ARB Texture mirrored repeat support
\n
"
);
This
->
gl_info
.
supported
[
ARB_TEXTURE_MIRRORED_REPEAT
]
=
TRUE
;
}
else
if
(
strstr
(
ThisExtn
,
"GL_ARB_vertex_program"
))
{
This
->
gl_info
.
vs_arb_version
=
VS_VERSION_11
;
FIXM
E
(
" FOUND: ARB Vertex Shader support - version=%02x
\n
"
,
This
->
gl_info
.
vs_arb_version
);
TRAC
E
(
" FOUND: ARB Vertex Shader support - version=%02x
\n
"
,
This
->
gl_info
.
vs_arb_version
);
This
->
gl_info
.
supported
[
ARB_VERTEX_PROGRAM
]
=
TRUE
;
/**
* EXT
*/
}
else
if
(
strcmp
(
ThisExtn
,
"GL_EXT_fog_coord"
)
==
0
)
{
FIXM
E
(
" FOUND: EXT Fog coord support
\n
"
);
TRAC
E
(
" FOUND: EXT Fog coord support
\n
"
);
This
->
gl_info
.
supported
[
EXT_FOG_COORD
]
=
TRUE
;
}
else
if
(
strcmp
(
ThisExtn
,
"GL_EXT_paletted_texture"
)
==
0
)
{
/* handle paletted texture extensions */
FIXM
E
(
" FOUND: EXT Paletted texture support
\n
"
);
TRAC
E
(
" FOUND: EXT Paletted texture support
\n
"
);
This
->
gl_info
.
supported
[
EXT_PALETTED_TEXTURE
]
=
TRUE
;
}
else
if
(
strcmp
(
ThisExtn
,
"GL_EXT_point_parameters"
)
==
0
)
{
FIXM
E
(
" FOUND: EXT Point parameters support
\n
"
);
TRAC
E
(
" FOUND: EXT Point parameters support
\n
"
);
This
->
gl_info
.
supported
[
EXT_POINT_PARAMETERS
]
=
TRUE
;
}
else
if
(
strcmp
(
ThisExtn
,
"GL_EXT_secondary_color"
)
==
0
)
{
FIXM
E
(
" FOUND: EXT Secondary coord support
\n
"
);
TRAC
E
(
" FOUND: EXT Secondary coord support
\n
"
);
This
->
gl_info
.
supported
[
EXT_SECONDARY_COLOR
]
=
TRUE
;
#if defined(GL_EXT_texture_compression_s3tc)
}
else
if
(
strcmp
(
ThisExtn
,
"GL_EXT_texture_compression_s3tc"
)
==
0
)
{
FIXM
E
(
" FOUND: EXT Texture S3TC compression support
\n
"
);
TRAC
E
(
" FOUND: EXT Texture S3TC compression support
\n
"
);
This
->
gl_info
.
supported
[
EXT_TEXTURE_COMPRESSION_S3TC
]
=
TRUE
;
#endif
}
else
if
(
strcmp
(
ThisExtn
,
"GL_EXT_texture_env_add"
)
==
0
)
{
FIXM
E
(
" FOUND: EXT Texture Env Add support
\n
"
);
TRAC
E
(
" FOUND: EXT Texture Env Add support
\n
"
);
This
->
gl_info
.
supported
[
EXT_TEXTURE_ENV_ADD
]
=
TRUE
;
}
else
if
(
strcmp
(
ThisExtn
,
"GL_EXT_texture_env_combine"
)
==
0
)
{
FIXM
E
(
" FOUND: EXT Texture Env combine support
\n
"
);
TRAC
E
(
" FOUND: EXT Texture Env combine support
\n
"
);
This
->
gl_info
.
supported
[
EXT_TEXTURE_ENV_COMBINE
]
=
TRUE
;
}
else
if
(
strcmp
(
ThisExtn
,
"GL_EXT_texture_env_dot3"
)
==
0
)
{
FIXM
E
(
" FOUND: EXT Dot3 support
\n
"
);
TRAC
E
(
" FOUND: EXT Dot3 support
\n
"
);
This
->
gl_info
.
supported
[
EXT_TEXTURE_ENV_DOT3
]
=
TRUE
;
}
else
if
(
strcmp
(
ThisExtn
,
"GL_EXT_texture_filter_anisotropic"
)
==
0
)
{
FIXM
E
(
" FOUND: EXT Texture Anisotropic filter support
\n
"
);
TRAC
E
(
" FOUND: EXT Texture Anisotropic filter support
\n
"
);
This
->
gl_info
.
supported
[
EXT_TEXTURE_FILTER_ANISOTROPIC
]
=
TRUE
;
}
else
if
(
strcmp
(
ThisExtn
,
"GL_EXT_texture_lod"
)
==
0
)
{
FIXM
E
(
" FOUND: EXT Texture LOD support
\n
"
);
TRAC
E
(
" FOUND: EXT Texture LOD support
\n
"
);
This
->
gl_info
.
supported
[
EXT_TEXTURE_LOD
]
=
TRUE
;
}
else
if
(
strcmp
(
ThisExtn
,
"GL_EXT_texture_lod_bias"
)
==
0
)
{
FIXM
E
(
" FOUND: EXT Texture LOD bias support
\n
"
);
TRAC
E
(
" FOUND: EXT Texture LOD bias support
\n
"
);
This
->
gl_info
.
supported
[
EXT_TEXTURE_LOD_BIAS
]
=
TRUE
;
}
else
if
(
strcmp
(
ThisExtn
,
"GL_EXT_vertex_weighting"
)
==
0
)
{
FIXM
E
(
" FOUND: EXT Vertex weighting support
\n
"
);
TRAC
E
(
" FOUND: EXT Vertex weighting support
\n
"
);
This
->
gl_info
.
supported
[
EXT_VERTEX_WEIGHTING
]
=
TRUE
;
/**
* NVIDIA
*/
}
else
if
(
strcmp
(
ThisExtn
,
"GL_NV_texture_env_combine4"
)
==
0
)
{
FIXM
E
(
" FOUND: NVIDIA (NV) Texture Env combine (4) support
\n
"
);
TRAC
E
(
" FOUND: NVIDIA (NV) Texture Env combine (4) support
\n
"
);
This
->
gl_info
.
supported
[
NV_TEXTURE_ENV_COMBINE4
]
=
TRUE
;
}
else
if
(
strstr
(
ThisExtn
,
"GL_NV_fragment_program"
))
{
This
->
gl_info
.
ps_nv_version
=
PS_VERSION_11
;
FIXM
E
(
" FOUND: NVIDIA (NV) Pixel Shader support - version=%02x
\n
"
,
This
->
gl_info
.
ps_nv_version
);
TRAC
E
(
" FOUND: NVIDIA (NV) Pixel Shader support - version=%02x
\n
"
,
This
->
gl_info
.
ps_nv_version
);
This
->
gl_info
.
supported
[
NV_FRAGMENT_PROGRAM
]
=
TRUE
;
}
else
if
(
strstr
(
ThisExtn
,
"GL_NV_vertex_program"
))
{
This
->
gl_info
.
vs_nv_version
=
max
(
This
->
gl_info
.
vs_nv_version
,
(
0
==
strcmp
(
ThisExtn
,
"GL_NV_vertex_program1_1"
))
?
VS_VERSION_11
:
VS_VERSION_10
);
This
->
gl_info
.
vs_nv_version
=
max
(
This
->
gl_info
.
vs_nv_version
,
(
0
==
strcmp
(
ThisExtn
,
"GL_NV_vertex_program2"
))
?
VS_VERSION_20
:
VS_VERSION_10
);
FIXM
E
(
" FOUND: NVIDIA (NV) Vertex Shader support - version=%02x
\n
"
,
This
->
gl_info
.
vs_nv_version
);
TRAC
E
(
" FOUND: NVIDIA (NV) Vertex Shader support - version=%02x
\n
"
,
This
->
gl_info
.
vs_nv_version
);
This
->
gl_info
.
supported
[
NV_VERTEX_PROGRAM
]
=
TRUE
;
/**
...
...
@@ -866,14 +866,14 @@ static void IDirect3D8Impl_FillGLCaps(LPDIRECT3D8 iface, Display* display) {
*/
/** TODO */
}
else
if
(
strcmp
(
ThisExtn
,
"GL_ATI_texture_env_combine3"
)
==
0
)
{
FIXM
E
(
" FOUND: ATI Texture Env combine (3) support
\n
"
);
TRAC
E
(
" FOUND: ATI Texture Env combine (3) support
\n
"
);
This
->
gl_info
.
supported
[
ATI_TEXTURE_ENV_COMBINE3
]
=
TRUE
;
}
else
if
(
strcmp
(
ThisExtn
,
"GL_ATI_texture_mirror_once"
)
==
0
)
{
FIXM
E
(
" FOUND: ATI Texture Mirror Once support
\n
"
);
TRAC
E
(
" FOUND: ATI Texture Mirror Once support
\n
"
);
This
->
gl_info
.
supported
[
ATI_TEXTURE_MIRROR_ONCE
]
=
TRUE
;
}
else
if
(
strcmp
(
ThisExtn
,
"GL_EXT_vertex_shader"
)
==
0
)
{
This
->
gl_info
.
vs_ati_version
=
VS_VERSION_11
;
FIXM
E
(
" FOUND: ATI (EXT) Vertex Shader support - version=%02x
\n
"
,
This
->
gl_info
.
vs_ati_version
);
TRAC
E
(
" FOUND: ATI (EXT) Vertex Shader support - version=%02x
\n
"
,
This
->
gl_info
.
vs_ati_version
);
This
->
gl_info
.
supported
[
EXT_VERTEX_SHADER
]
=
TRUE
;
}
...
...
@@ -888,7 +888,7 @@ static void IDirect3D8Impl_FillGLCaps(LPDIRECT3D8 iface, Display* display) {
if
(
display
!=
NULL
)
{
GLX_Extensions
=
glXQueryExtensionsString
(
display
,
DefaultScreen
(
display
));
FIXM
E
(
"GLX_Extensions reported:
\n
"
);
TRAC
E
(
"GLX_Extensions reported:
\n
"
);
if
(
NULL
==
GLX_Extensions
)
{
ERR
(
" GLX_Extensions returns NULL
\n
"
);
...
...
@@ -902,7 +902,7 @@ static void IDirect3D8Impl_FillGLCaps(LPDIRECT3D8 iface, Display* display) {
GLX_Extensions
++
;
}
memcpy
(
ThisExtn
,
Start
,
(
GLX_Extensions
-
Start
));
FIXM
E
(
"- %s
\n
"
,
ThisExtn
);
TRAC
E
(
"- %s
\n
"
,
ThisExtn
);
if
(
*
GLX_Extensions
==
' '
)
GLX_Extensions
++
;
}
}
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment