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
ac99d539
Commit
ac99d539
authored
Apr 25, 2013
by
Stefan Dösinger
Committed by
Alexandre Julliard
Apr 25, 2013
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
wined3d: Move valid_rt_mask to wined3d_d3d_info.
parent
cb01fb27
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
7 additions
and
6 deletions
+7
-6
context.c
dlls/wined3d/context.c
+1
-1
device.c
dlls/wined3d/device.c
+0
-4
directx.c
dlls/wined3d/directx.c
+5
-0
wined3d_private.h
dlls/wined3d/wined3d_private.h
+1
-1
No files found.
dlls/wined3d/context.c
View file @
ac99d539
...
...
@@ -2282,7 +2282,7 @@ static DWORD find_draw_buffers_mask(const struct wined3d_context *context, const
else
if
(
!
context
->
render_offscreen
)
return
context_generate_rt_mask_from_surface
(
rts
[
0
]);
rt_mask
=
ps
?
ps
->
reg_maps
.
rt_mask
:
1
;
rt_mask
&=
device
->
valid_rt_mask
;
rt_mask
&=
context
->
d3d_info
->
valid_rt_mask
;
rt_mask_bits
=
rt_mask
;
i
=
0
;
while
(
rt_mask_bits
)
...
...
dlls/wined3d/device.c
View file @
ac99d539
...
...
@@ -1111,7 +1111,6 @@ HRESULT CDECL wined3d_device_init_3d(struct wined3d_device *device,
struct
wined3d_context
*
context
;
HRESULT
hr
;
DWORD
state
;
unsigned
int
i
;
TRACE
(
"device %p, swapchain_desc %p.
\n
"
,
device
,
swapchain_desc
);
...
...
@@ -1120,9 +1119,6 @@ HRESULT CDECL wined3d_device_init_3d(struct wined3d_device *device,
if
(
device
->
wined3d
->
flags
&
WINED3D_NO3D
)
return
WINED3DERR_INVALIDCALL
;
device
->
valid_rt_mask
=
0
;
for
(
i
=
0
;
i
<
gl_info
->
limits
.
buffers
;
++
i
)
device
->
valid_rt_mask
|=
(
1
<<
i
);
device
->
fb
.
render_targets
=
HeapAlloc
(
GetProcessHeap
(),
HEAP_ZERO_MEMORY
,
sizeof
(
*
device
->
fb
.
render_targets
)
*
gl_info
->
limits
.
buffers
);
...
...
dlls/wined3d/directx.c
View file @
ac99d539
...
...
@@ -2632,6 +2632,7 @@ static BOOL wined3d_adapter_init_gl_caps(struct wined3d_adapter *adapter)
enum
wined3d_pci_device
device
;
DWORD
gl_version
;
HDC
hdc
;
unsigned
int
i
;
TRACE
(
"adapter %p.
\n
"
,
adapter
);
...
...
@@ -2935,6 +2936,10 @@ static BOOL wined3d_adapter_init_gl_caps(struct wined3d_adapter *adapter)
gl_info
->
wrap_lookup
[
WINED3D_TADDRESS_MIRROR_ONCE
-
WINED3D_TADDRESS_WRAP
]
=
gl_info
->
supported
[
ATI_TEXTURE_MIRROR_ONCE
]
?
GL_MIRROR_CLAMP_TO_EDGE_ATI
:
GL_REPEAT
;
adapter
->
d3d_info
.
valid_rt_mask
=
0
;
for
(
i
=
0
;
i
<
gl_info
->
limits
.
buffers
;
++
i
)
adapter
->
d3d_info
.
valid_rt_mask
|=
(
1
<<
i
);
fixup_extensions
(
gl_info
,
gl_renderer_str
,
gl_vendor
,
card_vendor
,
device
);
init_driver_info
(
driver_info
,
card_vendor
,
device
);
add_gl_compat_wrappers
(
gl_info
);
...
...
dlls/wined3d/wined3d_private.h
View file @
ac99d539
...
...
@@ -1599,6 +1599,7 @@ struct wined3d_d3d_info
{
struct
wined3d_d3d_limits
limits
;
BOOL
vs_clipping
;
DWORD
valid_rt_mask
;
};
/* The adapter structure */
...
...
@@ -1771,7 +1772,6 @@ struct wined3d_device
struct
list
shaders
;
/* a linked list to track shaders (pixel and vertex) */
/* Render Target Support */
DWORD
valid_rt_mask
;
struct
wined3d_fb_state
fb
;
struct
wined3d_surface
*
onscreen_depth_stencil
;
struct
wined3d_surface
*
auto_depth_stencil
;
...
...
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