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
de9e1cdc
Commit
de9e1cdc
authored
Nov 05, 2013
by
Rico Schüller
Committed by
Alexandre Julliard
Nov 06, 2013
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
wined3d: Use GL_ARB_texture_mirror_clamp_to_edge when available.
parent
aa536031
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
10 additions
and
3 deletions
+10
-3
directx.c
dlls/wined3d/directx.c
+9
-3
wined3d_gl.h
dlls/wined3d/wined3d_gl.h
+1
-0
No files found.
dlls/wined3d/directx.c
View file @
de9e1cdc
...
...
@@ -134,6 +134,7 @@ static const struct wined3d_extension_map gl_extension_map[] =
{
"GL_ARB_texture_env_dot3"
,
ARB_TEXTURE_ENV_DOT3
},
{
"GL_ARB_texture_float"
,
ARB_TEXTURE_FLOAT
},
{
"GL_ARB_texture_mirrored_repeat"
,
ARB_TEXTURE_MIRRORED_REPEAT
},
{
"GL_ARB_texture_mirror_clamp_to_edge"
,
ARB_TEXTURE_MIRROR_CLAMP_TO_EDGE
},
{
"GL_ARB_texture_non_power_of_two"
,
ARB_TEXTURE_NON_POWER_OF_TWO
},
{
"GL_ARB_texture_rectangle"
,
ARB_TEXTURE_RECTANGLE
},
{
"GL_ARB_texture_rg"
,
ARB_TEXTURE_RG
},
...
...
@@ -2932,6 +2933,11 @@ static BOOL wined3d_adapter_init_gl_caps(struct wined3d_adapter *adapter)
if
(
!
counter_bits
)
gl_info
->
supported
[
ARB_OCCLUSION_QUERY
]
=
FALSE
;
}
if
(
!
gl_info
->
supported
[
ARB_TEXTURE_MIRROR_CLAMP_TO_EDGE
]
&&
gl_info
->
supported
[
ATI_TEXTURE_MIRROR_ONCE
])
{
TRACE
(
" IMPLIED: ARB_texture_mirror_clamp_to_edge support (by ATI_texture_mirror_once).
\n
"
);
gl_info
->
supported
[
ARB_TEXTURE_MIRROR_CLAMP_TO_EDGE
]
=
TRUE
;
}
wined3d_adapter_init_limits
(
gl_info
);
...
...
@@ -3049,7 +3055,7 @@ static BOOL wined3d_adapter_init_gl_caps(struct wined3d_adapter *adapter)
gl_info
->
wrap_lookup
[
WINED3D_TADDRESS_BORDER
-
WINED3D_TADDRESS_WRAP
]
=
gl_info
->
supported
[
ARB_TEXTURE_BORDER_CLAMP
]
?
GL_CLAMP_TO_BORDER_ARB
:
GL_REPEAT
;
gl_info
->
wrap_lookup
[
WINED3D_TADDRESS_MIRROR_ONCE
-
WINED3D_TADDRESS_WRAP
]
=
gl_info
->
supported
[
A
TI_TEXTURE_MIRROR_ONCE
]
?
GL_MIRROR_CLAMP_TO_EDGE_ATI
:
GL_REPEAT
;
gl_info
->
supported
[
A
RB_TEXTURE_MIRROR_CLAMP_TO_EDGE
]
?
GL_MIRROR_CLAMP_TO_EDGE
:
GL_REPEAT
;
adapter
->
d3d_info
.
valid_rt_mask
=
0
;
for
(
i
=
0
;
i
<
gl_info
->
limits
.
buffers
;
++
i
)
...
...
@@ -4349,7 +4355,7 @@ HRESULT CDECL wined3d_get_device_caps(const struct wined3d *wined3d, UINT adapte
{
caps
->
TextureAddressCaps
|=
WINED3DPTADDRESSCAPS_MIRROR
;
}
if
(
gl_info
->
supported
[
A
TI_TEXTURE_MIRROR_ONC
E
])
if
(
gl_info
->
supported
[
A
RB_TEXTURE_MIRROR_CLAMP_TO_EDG
E
])
{
caps
->
TextureAddressCaps
|=
WINED3DPTADDRESSCAPS_MIRRORONCE
;
}
...
...
@@ -4367,7 +4373,7 @@ HRESULT CDECL wined3d_get_device_caps(const struct wined3d *wined3d, UINT adapte
{
caps
->
VolumeTextureAddressCaps
|=
WINED3DPTADDRESSCAPS_MIRROR
;
}
if
(
gl_info
->
supported
[
A
TI_TEXTURE_MIRROR_ONC
E
])
if
(
gl_info
->
supported
[
A
RB_TEXTURE_MIRROR_CLAMP_TO_EDG
E
])
{
caps
->
VolumeTextureAddressCaps
|=
WINED3DPTADDRESSCAPS_MIRRORONCE
;
}
...
...
dlls/wined3d/wined3d_gl.h
View file @
de9e1cdc
...
...
@@ -84,6 +84,7 @@ enum wined3d_gl_extension
ARB_TEXTURE_ENV_DOT3
,
ARB_TEXTURE_FLOAT
,
ARB_TEXTURE_MIRRORED_REPEAT
,
ARB_TEXTURE_MIRROR_CLAMP_TO_EDGE
,
ARB_TEXTURE_NON_POWER_OF_TWO
,
ARB_TEXTURE_RECTANGLE
,
ARB_TEXTURE_RG
,
...
...
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