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
d4fa7e4c
Commit
d4fa7e4c
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 write control support in struct wined3d_d3d_info.
Signed-off-by:
Henri Verbeet
<
hverbeet@codeweavers.com
>
Signed-off-by:
Alexandre Julliard
<
julliard@winehq.org
>
parent
60938b4e
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
19 additions
and
17 deletions
+19
-17
adapter_gl.c
dlls/wined3d/adapter_gl.c
+1
-0
shader.c
dlls/wined3d/shader.c
+1
-1
utils.c
dlls/wined3d/utils.c
+1
-1
wined3d_private.h
dlls/wined3d/wined3d_private.h
+16
-15
No files found.
dlls/wined3d/adapter_gl.c
View file @
d4fa7e4c
...
...
@@ -3795,6 +3795,7 @@ static BOOL wined3d_adapter_init_gl_caps(struct wined3d_adapter *adapter,
d3d_info
->
vertex_bgra
=
!!
gl_info
->
supported
[
ARB_VERTEX_ARRAY_BGRA
];
d3d_info
->
texture_swizzle
=
!!
gl_info
->
supported
[
ARB_TEXTURE_SWIZZLE
];
d3d_info
->
srgb_read_control
=
!!
gl_info
->
supported
[
EXT_TEXTURE_SRGB_DECODE
];
d3d_info
->
srgb_write_control
=
!!
gl_info
->
supported
[
ARB_FRAMEBUFFER_SRGB
];
if
(
gl_info
->
supported
[
ARB_TEXTURE_MULTISAMPLE
])
d3d_info
->
multisample_draw_location
=
WINED3D_LOCATION_TEXTURE_RGB
;
...
...
dlls/wined3d/shader.c
View file @
d4fa7e4c
...
...
@@ -3902,7 +3902,7 @@ void find_ps_compile_args(const struct wined3d_state *state, const struct wined3
unsigned
int
i
;
memset
(
args
,
0
,
sizeof
(
*
args
));
/* FIXME: Make sure all bits are set. */
if
(
!
gl_info
->
supported
[
ARB_FRAMEBUFFER_SRGB
]
&&
needs_srgb_write
(
context
,
state
,
state
->
fb
))
if
(
!
d3d_info
->
srgb_write_control
&&
needs_srgb_write
(
context
,
state
,
state
->
fb
))
{
static
unsigned
int
warned
=
0
;
...
...
dlls/wined3d/utils.c
View file @
d4fa7e4c
...
...
@@ -6167,7 +6167,7 @@ void gen_ffp_frag_op(const struct wined3d_context *context, const struct wined3d
break
;
}
}
settings
->
sRGB_write
=
!
gl_info
->
supported
[
ARB_FRAMEBUFFER_SRGB
]
&&
needs_srgb_write
(
context
,
state
,
state
->
fb
);
settings
->
sRGB_write
=
!
d3d_info
->
srgb_write_control
&&
needs_srgb_write
(
context
,
state
,
state
->
fb
);
if
(
d3d_info
->
vs_clipping
||
!
use_vs
(
state
)
||
!
state
->
render_states
[
WINED3D_RS_CLIPPING
]
||
!
state
->
render_states
[
WINED3D_RS_CLIPPLANEENABLE
])
{
...
...
dlls/wined3d/wined3d_private.h
View file @
d4fa7e4c
...
...
@@ -198,21 +198,22 @@ struct wined3d_d3d_info
{
struct
wined3d_d3d_limits
limits
;
struct
wined3d_ffp_attrib_ops
ffp_attrib_ops
;
unsigned
int
wined3d_creation_flags
;
unsigned
int
xyzrhw
:
1
;
unsigned
int
emulated_flatshading
:
1
;
unsigned
int
ffp_generic_attributes
:
1
;
unsigned
int
vs_clipping
:
1
;
unsigned
int
shader_color_key
:
1
;
unsigned
int
shader_double_precision
:
1
;
unsigned
int
shader_output_interpolation
:
1
;
unsigned
int
viewport_array_index_any_shader
:
1
;
unsigned
int
texture_npot
:
1
;
unsigned
int
texture_npot_conditional
:
1
;
unsigned
int
draw_base_vertex_offset
:
1
;
unsigned
int
vertex_bgra
:
1
;
unsigned
int
texture_swizzle
:
1
;
unsigned
int
srgb_read_control
:
1
;
uint32_t
wined3d_creation_flags
;
uint32_t
xyzrhw
:
1
;
uint32_t
emulated_flatshading
:
1
;
uint32_t
ffp_generic_attributes
:
1
;
uint32_t
vs_clipping
:
1
;
uint32_t
shader_color_key
:
1
;
uint32_t
shader_double_precision
:
1
;
uint32_t
shader_output_interpolation
:
1
;
uint32_t
viewport_array_index_any_shader
:
1
;
uint32_t
texture_npot
:
1
;
uint32_t
texture_npot_conditional
:
1
;
uint32_t
draw_base_vertex_offset
:
1
;
uint32_t
vertex_bgra
:
1
;
uint32_t
texture_swizzle
:
1
;
uint32_t
srgb_read_control
:
1
;
uint32_t
srgb_write_control
:
1
;
enum
wined3d_feature_level
feature_level
;
DWORD
multisample_draw_location
;
...
...
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