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
60938b4e
Commit
60938b4e
authored
Aug 06, 2019
by
Henri Verbeet
Committed by
Alexandre Julliard
Aug 06, 2019
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
wined3d: Store sRGB read control support in struct wined3d_d3d_info.
Signed-off-by:
Henri Verbeet
<
hverbeet@codeweavers.com
>
Signed-off-by:
Alexandre Julliard
<
julliard@winehq.org
>
parent
15dd8e2b
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
3 additions
and
1 deletion
+3
-1
adapter_gl.c
dlls/wined3d/adapter_gl.c
+1
-0
wined3d_private.h
dlls/wined3d/wined3d_private.h
+2
-1
No files found.
dlls/wined3d/adapter_gl.c
View file @
60938b4e
...
@@ -3794,6 +3794,7 @@ static BOOL wined3d_adapter_init_gl_caps(struct wined3d_adapter *adapter,
...
@@ -3794,6 +3794,7 @@ static BOOL wined3d_adapter_init_gl_caps(struct wined3d_adapter *adapter,
d3d_info
->
draw_base_vertex_offset
=
!!
gl_info
->
supported
[
ARB_DRAW_ELEMENTS_BASE_VERTEX
];
d3d_info
->
draw_base_vertex_offset
=
!!
gl_info
->
supported
[
ARB_DRAW_ELEMENTS_BASE_VERTEX
];
d3d_info
->
vertex_bgra
=
!!
gl_info
->
supported
[
ARB_VERTEX_ARRAY_BGRA
];
d3d_info
->
vertex_bgra
=
!!
gl_info
->
supported
[
ARB_VERTEX_ARRAY_BGRA
];
d3d_info
->
texture_swizzle
=
!!
gl_info
->
supported
[
ARB_TEXTURE_SWIZZLE
];
d3d_info
->
texture_swizzle
=
!!
gl_info
->
supported
[
ARB_TEXTURE_SWIZZLE
];
d3d_info
->
srgb_read_control
=
!!
gl_info
->
supported
[
EXT_TEXTURE_SRGB_DECODE
];
if
(
gl_info
->
supported
[
ARB_TEXTURE_MULTISAMPLE
])
if
(
gl_info
->
supported
[
ARB_TEXTURE_MULTISAMPLE
])
d3d_info
->
multisample_draw_location
=
WINED3D_LOCATION_TEXTURE_RGB
;
d3d_info
->
multisample_draw_location
=
WINED3D_LOCATION_TEXTURE_RGB
;
...
...
dlls/wined3d/wined3d_private.h
View file @
60938b4e
...
@@ -212,6 +212,7 @@ struct wined3d_d3d_info
...
@@ -212,6 +212,7 @@ struct wined3d_d3d_info
unsigned
int
draw_base_vertex_offset
:
1
;
unsigned
int
draw_base_vertex_offset
:
1
;
unsigned
int
vertex_bgra
:
1
;
unsigned
int
vertex_bgra
:
1
;
unsigned
int
texture_swizzle
:
1
;
unsigned
int
texture_swizzle
:
1
;
unsigned
int
srgb_read_control
:
1
;
enum
wined3d_feature_level
feature_level
;
enum
wined3d_feature_level
feature_level
;
DWORD
multisample_draw_location
;
DWORD
multisample_draw_location
;
...
@@ -4819,7 +4820,7 @@ static inline BOOL needs_separate_srgb_gl_texture(const struct wined3d_context *
...
@@ -4819,7 +4820,7 @@ static inline BOOL needs_separate_srgb_gl_texture(const struct wined3d_context *
unsigned
int
flags
=
texture
->
resource
.
format_flags
unsigned
int
flags
=
texture
->
resource
.
format_flags
&
(
WINED3DFMT_FLAG_SRGB_READ
|
WINED3DFMT_FLAG_SRGB_WRITE
);
&
(
WINED3DFMT_FLAG_SRGB_READ
|
WINED3DFMT_FLAG_SRGB_WRITE
);
return
(
!
context
->
gl_info
->
supported
[
EXT_TEXTURE_SRGB_DECODE
]
return
(
!
context
->
d3d_info
->
srgb_read_control
||
(
flags
&&
flags
!=
(
WINED3DFMT_FLAG_SRGB_READ
|
WINED3DFMT_FLAG_SRGB_WRITE
)))
||
(
flags
&&
flags
!=
(
WINED3DFMT_FLAG_SRGB_READ
|
WINED3DFMT_FLAG_SRGB_WRITE
)))
&&
context
->
d3d_info
->
wined3d_creation_flags
&
WINED3D_SRGB_READ_WRITE_CONTROL
;
&&
context
->
d3d_info
->
wined3d_creation_flags
&
WINED3D_SRGB_READ_WRITE_CONTROL
;
}
}
...
...
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