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
1f2976a3
Commit
1f2976a3
authored
Apr 05, 2010
by
Roderick Colenbrander
Committed by
Alexandre Julliard
Apr 06, 2010
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
wined3d: Move the arbfp p8 fixup to the format table and get rid of the d3dfmt_get_conv override.
parent
a5a4be4f
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
1 addition
and
9 deletions
+1
-9
surface.c
dlls/wined3d/surface.c
+0
-8
utils.c
dlls/wined3d/utils.c
+1
-1
No files found.
dlls/wined3d/surface.c
View file @
1f2976a3
...
@@ -2166,14 +2166,6 @@ HRESULT d3dfmt_get_conv(IWineD3DSurfaceImpl *This, BOOL need_alpha_ck, BOOL use_
...
@@ -2166,14 +2166,6 @@ HRESULT d3dfmt_get_conv(IWineD3DSurfaceImpl *This, BOOL need_alpha_ck, BOOL use_
*
convert
=
CONVERT_PALETTED
;
*
convert
=
CONVERT_PALETTED
;
}
}
}
}
/* TODO: this check is evil and should die (it basically checks which blitter backend is used) */
else
if
(
!
gl_info
->
supported
[
EXT_PALETTED_TEXTURE
]
&&
device
->
blitter
->
color_fixup_supported
(
gl_info
,
This
->
resource
.
format_desc
->
color_fixup
))
{
*
format
=
GL_ALPHA
;
*
type
=
GL_UNSIGNED_BYTE
;
*
target_bpp
=
1
;
}
break
;
break
;
case
WINED3DFMT_B2G3R3_UNORM
:
case
WINED3DFMT_B2G3R3_UNORM
:
...
...
dlls/wined3d/utils.c
View file @
1f2976a3
...
@@ -336,7 +336,7 @@ static const struct wined3d_format_texture_info format_texture_info[] =
...
@@ -336,7 +336,7 @@ static const struct wined3d_format_texture_info format_texture_info[] =
ARB_TEXTURE_FLOAT
},
ARB_TEXTURE_FLOAT
},
/* Palettized formats */
/* Palettized formats */
{
WINED3DFMT_P8_UINT
,
GL_RGBA
,
GL_RGBA
,
0
,
{
WINED3DFMT_P8_UINT
,
GL_RGBA
,
GL_RGBA
,
0
,
GL_
RGBA
,
GL_UNSIGNED_BYTE
,
GL_
ALPHA
,
GL_UNSIGNED_BYTE
,
0
,
0
,
ARB_FRAGMENT_PROGRAM
},
ARB_FRAGMENT_PROGRAM
},
{
WINED3DFMT_P8_UINT
,
GL_COLOR_INDEX8_EXT
,
GL_COLOR_INDEX8_EXT
,
0
,
{
WINED3DFMT_P8_UINT
,
GL_COLOR_INDEX8_EXT
,
GL_COLOR_INDEX8_EXT
,
0
,
...
...
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