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
04a195a9
Commit
04a195a9
authored
Jul 06, 2015
by
Matteo Bruni
Committed by
Alexandre Julliard
Jul 07, 2015
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
wined3d: Use a core-compatible GL format for ATI2N.
parent
8839e7fb
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
16 additions
and
1 deletion
+16
-1
directx.c
dlls/wined3d/directx.c
+10
-0
utils.c
dlls/wined3d/utils.c
+6
-1
No files found.
dlls/wined3d/directx.c
View file @
04a195a9
...
...
@@ -3465,11 +3465,21 @@ static BOOL wined3d_adapter_init_gl_caps(struct wined3d_adapter *adapter)
TRACE
(
" IMPLIED: ARB_vertex_array_bgra support (by EXT_vertex_array_bgra).
\n
"
);
gl_info
->
supported
[
ARB_VERTEX_ARRAY_BGRA
]
=
TRUE
;
}
if
(
!
gl_info
->
supported
[
EXT_TEXTURE_COMPRESSION_RGTC
]
&&
gl_info
->
supported
[
ARB_TEXTURE_COMPRESSION_RGTC
])
{
TRACE
(
" IMPLIED: EXT_texture_compression_rgtc support (by ARB_texture_compression_rgtc).
\n
"
);
gl_info
->
supported
[
EXT_TEXTURE_COMPRESSION_RGTC
]
=
TRUE
;
}
if
(
!
gl_info
->
supported
[
ARB_TEXTURE_COMPRESSION_RGTC
]
&&
gl_info
->
supported
[
EXT_TEXTURE_COMPRESSION_RGTC
])
{
TRACE
(
" IMPLIED: ARB_texture_compression_rgtc support (by EXT_texture_compression_rgtc).
\n
"
);
gl_info
->
supported
[
ARB_TEXTURE_COMPRESSION_RGTC
]
=
TRUE
;
}
if
(
gl_info
->
supported
[
ARB_TEXTURE_COMPRESSION_RGTC
]
&&
!
gl_info
->
supported
[
ARB_TEXTURE_RG
])
{
TRACE
(
"ARB_texture_rg not supported, disabling ARB_texture_compression_rgtc.
\n
"
);
gl_info
->
supported
[
ARB_TEXTURE_COMPRESSION_RGTC
]
=
FALSE
;
}
if
(
gl_info
->
supported
[
NV_TEXTURE_SHADER2
])
{
if
(
gl_info
->
supported
[
NV_REGISTER_COMBINERS
])
...
...
dlls/wined3d/utils.c
View file @
04a195a9
...
...
@@ -1269,6 +1269,11 @@ static const struct wined3d_format_texture_info format_texture_info[] =
GL_LUMINANCE_ALPHA
,
GL_UNSIGNED_BYTE
,
0
,
WINED3DFMT_FLAG_TEXTURE
|
WINED3DFMT_FLAG_POSTPIXELSHADER_BLENDING
|
WINED3DFMT_FLAG_FILTERING
|
WINED3DFMT_FLAG_COMPRESSED
,
EXT_TEXTURE_COMPRESSION_RGTC
,
NULL
},
{
WINED3DFMT_ATI2N
,
GL_COMPRESSED_RG_RGTC2
,
GL_COMPRESSED_RG_RGTC2
,
0
,
GL_RG
,
GL_UNSIGNED_BYTE
,
0
,
WINED3DFMT_FLAG_TEXTURE
|
WINED3DFMT_FLAG_POSTPIXELSHADER_BLENDING
|
WINED3DFMT_FLAG_FILTERING
|
WINED3DFMT_FLAG_COMPRESSED
,
ARB_TEXTURE_COMPRESSION_RGTC
,
NULL
},
{
WINED3DFMT_INTZ
,
GL_DEPTH24_STENCIL8_EXT
,
GL_DEPTH24_STENCIL8_EXT
,
0
,
GL_DEPTH_STENCIL_EXT
,
GL_UNSIGNED_INT_24_8_EXT
,
0
,
...
...
@@ -2381,7 +2386,7 @@ static void apply_format_fixups(struct wined3d_adapter *adapter, struct wined3d_
1
,
CHANNEL_SOURCE_X
,
1
,
CHANNEL_SOURCE_Y
,
0
,
CHANNEL_SOURCE_Z
,
0
,
CHANNEL_SOURCE_W
);
}
if
(
gl_info
->
supported
[
ARB_TEXTURE_COMPRESSION_RGTC
])
if
(
gl_info
->
supported
[
ARB_TEXTURE_COMPRESSION_RGTC
]
||
gl_info
->
supported
[
EXT_TEXTURE_COMPRESSION_RGTC
]
)
{
idx
=
getFmtIdx
(
WINED3DFMT_ATI1N
);
gl_info
->
formats
[
idx
].
color_fixup
=
create_color_fixup_desc
(
...
...
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