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
Releases
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
Johnny Cai
wine
Commits
e51b0070
Commit
e51b0070
authored
22 years ago
by
Lionel Ulmer
Committed by
Alexandre Julliard
22 years ago
Browse files
Options
Downloads
Patches
Plain Diff
Fix order of texture enumeration to fix yet another set of dumb games.
parent
4fc7a849
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/ddraw/d3ddevice/mesa.c
+17
-15
17 additions, 15 deletions
dlls/ddraw/d3ddevice/mesa.c
with
17 additions
and
15 deletions
dlls/ddraw/d3ddevice/mesa.c
+
17
−
15
View file @
e51b0070
...
...
@@ -403,16 +403,8 @@ static HRESULT enum_texture_format_OpenGL(LPD3DENUMTEXTUREFORMATSCALLBACK cb_1,
if
(
cb_1
)
if
(
cb_1
(
&
sdesc
,
context
)
==
0
)
return
DD_OK
;
if
(
cb_2
)
if
(
cb_2
(
pformat
,
context
)
==
0
)
return
DD_OK
;
TRACE
(
"Enumerating GL_RGBA packed GL_UNSIGNED_SHORT_5_5_5_1 (16)
\n
"
);
pformat
->
dwFlags
=
DDPF_RGB
|
DDPF_ALPHAPIXELS
;
pformat
->
u1
.
dwRGBBitCount
=
16
;
pformat
->
u2
.
dwRBitMask
=
0x0000F800
;
pformat
->
u3
.
dwGBitMask
=
0x000007C0
;
pformat
->
u4
.
dwBBitMask
=
0x0000003E
;
pformat
->
u5
.
dwRGBAlphaBitMask
=
0x00000001
;
if
(
cb_1
)
if
(
cb_1
(
&
sdesc
,
context
)
==
0
)
return
DD_OK
;
if
(
cb_2
)
if
(
cb_2
(
pformat
,
context
)
==
0
)
return
DD_OK
;
/* Note : even if this is an 'emulated' texture format, it needs to be first
as some dumb applications seem to rely on that. */
TRACE
(
"Enumerating GL_RGBA packed GL_UNSIGNED_SHORT_1_5_5_5 (ARGB) (16)
\n
"
);
pformat
->
dwFlags
=
DDPF_RGB
|
DDPF_ALPHAPIXELS
;
pformat
->
u1
.
dwRGBBitCount
=
16
;
...
...
@@ -423,13 +415,13 @@ static HRESULT enum_texture_format_OpenGL(LPD3DENUMTEXTUREFORMATSCALLBACK cb_1,
if
(
cb_1
)
if
(
cb_1
(
&
sdesc
,
context
)
==
0
)
return
DD_OK
;
if
(
cb_2
)
if
(
cb_2
(
pformat
,
context
)
==
0
)
return
DD_OK
;
TRACE
(
"Enumerating GL_RGBA packed GL_UNSIGNED_SHORT_
4_4_4_4
(16)
\n
"
);
TRACE
(
"Enumerating GL_RGBA packed GL_UNSIGNED_SHORT_
5_5_5_1
(16)
\n
"
);
pformat
->
dwFlags
=
DDPF_RGB
|
DDPF_ALPHAPIXELS
;
pformat
->
u1
.
dwRGBBitCount
=
16
;
pformat
->
u2
.
dwRBitMask
=
0x0000F
0
00
;
pformat
->
u3
.
dwGBitMask
=
0x00000
F0
0
;
pformat
->
u4
.
dwBBitMask
=
0x000000
F0
;
pformat
->
u5
.
dwRGBAlphaBitMask
=
0x0000000
F
;
pformat
->
u2
.
dwRBitMask
=
0x0000F
8
00
;
pformat
->
u3
.
dwGBitMask
=
0x00000
7C
0
;
pformat
->
u4
.
dwBBitMask
=
0x000000
3E
;
pformat
->
u5
.
dwRGBAlphaBitMask
=
0x0000000
1
;
if
(
cb_1
)
if
(
cb_1
(
&
sdesc
,
context
)
==
0
)
return
DD_OK
;
if
(
cb_2
)
if
(
cb_2
(
pformat
,
context
)
==
0
)
return
DD_OK
;
...
...
@@ -443,6 +435,16 @@ static HRESULT enum_texture_format_OpenGL(LPD3DENUMTEXTUREFORMATSCALLBACK cb_1,
if
(
cb_1
)
if
(
cb_1
(
&
sdesc
,
context
)
==
0
)
return
DD_OK
;
if
(
cb_2
)
if
(
cb_2
(
pformat
,
context
)
==
0
)
return
DD_OK
;
TRACE
(
"Enumerating GL_RGBA packed GL_UNSIGNED_SHORT_4_4_4_4 (16)
\n
"
);
pformat
->
dwFlags
=
DDPF_RGB
|
DDPF_ALPHAPIXELS
;
pformat
->
u1
.
dwRGBBitCount
=
16
;
pformat
->
u2
.
dwRBitMask
=
0x0000F000
;
pformat
->
u3
.
dwGBitMask
=
0x00000F00
;
pformat
->
u4
.
dwBBitMask
=
0x000000F0
;
pformat
->
u5
.
dwRGBAlphaBitMask
=
0x0000000F
;
if
(
cb_1
)
if
(
cb_1
(
&
sdesc
,
context
)
==
0
)
return
DD_OK
;
if
(
cb_2
)
if
(
cb_2
(
pformat
,
context
)
==
0
)
return
DD_OK
;
TRACE
(
"Enumerating GL_RGB packed GL_UNSIGNED_BYTE_3_3_2 (8)
\n
"
);
pformat
->
dwFlags
=
DDPF_RGB
;
pformat
->
u1
.
dwRGBBitCount
=
8
;
...
...
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