Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
W
wine-cw
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-cw
Commits
fdf60e51
Commit
fdf60e51
authored
Sep 19, 2014
by
Henri Verbeet
Committed by
Alexandre Julliard
Sep 19, 2014
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
d3d10core: Implement d3d10_device_SetPredication().
parent
686546b6
Hide whitespace changes
Inline
Side-by-side
Showing
8 changed files
with
73 additions
and
1 deletion
+73
-1
async.c
dlls/d3d10core/async.c
+8
-0
d3d10core_private.h
dlls/d3d10core/d3d10core_private.h
+1
-0
device.c
dlls/d3d10core/device.c
+7
-1
cs.c
dlls/wined3d/cs.c
+29
-0
device.c
dlls/wined3d/device.c
+21
-0
wined3d.spec
dlls/wined3d/wined3d.spec
+1
-0
wined3d_private.h
dlls/wined3d/wined3d_private.h
+4
-0
wined3d.h
include/wine/wined3d.h
+2
-0
No files found.
dlls/d3d10core/async.c
View file @
fdf60e51
...
@@ -171,6 +171,14 @@ static const struct ID3D10QueryVtbl d3d10_query_vtbl =
...
@@ -171,6 +171,14 @@ static const struct ID3D10QueryVtbl d3d10_query_vtbl =
d3d10_query_GetDesc
,
d3d10_query_GetDesc
,
};
};
struct
d3d10_query
*
unsafe_impl_from_ID3D10Query
(
ID3D10Query
*
iface
)
{
if
(
!
iface
)
return
NULL
;
assert
(
iface
->
lpVtbl
==
&
d3d10_query_vtbl
);
return
CONTAINING_RECORD
(
iface
,
struct
d3d10_query
,
ID3D10Query_iface
);
}
HRESULT
d3d10_query_init
(
struct
d3d10_query
*
query
,
struct
d3d10_device
*
device
,
HRESULT
d3d10_query_init
(
struct
d3d10_query
*
query
,
struct
d3d10_device
*
device
,
const
D3D10_QUERY_DESC
*
desc
,
BOOL
predicate
)
const
D3D10_QUERY_DESC
*
desc
,
BOOL
predicate
)
{
{
...
...
dlls/d3d10core/d3d10core_private.h
View file @
fdf60e51
...
@@ -304,6 +304,7 @@ struct d3d10_query
...
@@ -304,6 +304,7 @@ struct d3d10_query
HRESULT
d3d10_query_init
(
struct
d3d10_query
*
query
,
struct
d3d10_device
*
device
,
HRESULT
d3d10_query_init
(
struct
d3d10_query
*
query
,
struct
d3d10_device
*
device
,
const
D3D10_QUERY_DESC
*
desc
,
BOOL
predicate
)
DECLSPEC_HIDDEN
;
const
D3D10_QUERY_DESC
*
desc
,
BOOL
predicate
)
DECLSPEC_HIDDEN
;
struct
d3d10_query
*
unsafe_impl_from_ID3D10Query
(
ID3D10Query
*
iface
)
DECLSPEC_HIDDEN
;
/* IDirect3D10Device1 */
/* IDirect3D10Device1 */
struct
d3d10_device
struct
d3d10_device
...
...
dlls/d3d10core/device.c
View file @
fdf60e51
...
@@ -385,7 +385,13 @@ static void STDMETHODCALLTYPE d3d10_device_VSSetSamplers(ID3D10Device1 *iface,
...
@@ -385,7 +385,13 @@ static void STDMETHODCALLTYPE d3d10_device_VSSetSamplers(ID3D10Device1 *iface,
static
void
STDMETHODCALLTYPE
d3d10_device_SetPredication
(
ID3D10Device1
*
iface
,
ID3D10Predicate
*
predicate
,
BOOL
value
)
static
void
STDMETHODCALLTYPE
d3d10_device_SetPredication
(
ID3D10Device1
*
iface
,
ID3D10Predicate
*
predicate
,
BOOL
value
)
{
{
FIXME
(
"iface %p, predicate %p, value %d stub!
\n
"
,
iface
,
predicate
,
value
);
struct
d3d10_device
*
device
=
impl_from_ID3D10Device
(
iface
);
struct
d3d10_query
*
query
;
TRACE
(
"iface %p, predicate %p, value %#x.
\n
"
,
iface
,
predicate
,
value
);
query
=
unsafe_impl_from_ID3D10Query
((
ID3D10Query
*
)
predicate
);
wined3d_device_set_predication
(
device
->
wined3d_device
,
query
?
query
->
wined3d_query
:
NULL
,
value
);
}
}
static
void
STDMETHODCALLTYPE
d3d10_device_GSSetShaderResources
(
ID3D10Device1
*
iface
,
static
void
STDMETHODCALLTYPE
d3d10_device_GSSetShaderResources
(
ID3D10Device1
*
iface
,
...
...
dlls/wined3d/cs.c
View file @
fdf60e51
...
@@ -29,6 +29,7 @@ enum wined3d_cs_op
...
@@ -29,6 +29,7 @@ enum wined3d_cs_op
WINED3D_CS_OP_PRESENT
,
WINED3D_CS_OP_PRESENT
,
WINED3D_CS_OP_CLEAR
,
WINED3D_CS_OP_CLEAR
,
WINED3D_CS_OP_DRAW
,
WINED3D_CS_OP_DRAW
,
WINED3D_CS_OP_SET_PREDICATION
,
WINED3D_CS_OP_SET_VIEWPORT
,
WINED3D_CS_OP_SET_VIEWPORT
,
WINED3D_CS_OP_SET_SCISSOR_RECT
,
WINED3D_CS_OP_SET_SCISSOR_RECT
,
WINED3D_CS_OP_SET_RENDERTARGET_VIEW
,
WINED3D_CS_OP_SET_RENDERTARGET_VIEW
,
...
@@ -84,6 +85,13 @@ struct wined3d_cs_draw
...
@@ -84,6 +85,13 @@ struct wined3d_cs_draw
BOOL
indexed
;
BOOL
indexed
;
};
};
struct
wined3d_cs_set_predication
{
enum
wined3d_cs_op
opcode
;
struct
wined3d_query
*
predicate
;
BOOL
value
;
};
struct
wined3d_cs_set_viewport
struct
wined3d_cs_set_viewport
{
{
enum
wined3d_cs_op
opcode
;
enum
wined3d_cs_op
opcode
;
...
@@ -317,6 +325,26 @@ void wined3d_cs_emit_draw(struct wined3d_cs *cs, UINT start_idx, UINT index_coun
...
@@ -317,6 +325,26 @@ void wined3d_cs_emit_draw(struct wined3d_cs *cs, UINT start_idx, UINT index_coun
cs
->
ops
->
submit
(
cs
);
cs
->
ops
->
submit
(
cs
);
}
}
static
void
wined3d_cs_exec_set_predication
(
struct
wined3d_cs
*
cs
,
const
void
*
data
)
{
const
struct
wined3d_cs_set_predication
*
op
=
data
;
cs
->
state
.
predicate
=
op
->
predicate
;
cs
->
state
.
predicate_value
=
op
->
value
;
}
void
wined3d_cs_emit_set_predication
(
struct
wined3d_cs
*
cs
,
struct
wined3d_query
*
predicate
,
BOOL
value
)
{
struct
wined3d_cs_set_predication
*
op
;
op
=
cs
->
ops
->
require_space
(
cs
,
sizeof
(
*
op
));
op
->
opcode
=
WINED3D_CS_OP_SET_PREDICATION
;
op
->
predicate
=
predicate
;
op
->
value
=
value
;
cs
->
ops
->
submit
(
cs
);
}
static
void
wined3d_cs_exec_set_viewport
(
struct
wined3d_cs
*
cs
,
const
void
*
data
)
static
void
wined3d_cs_exec_set_viewport
(
struct
wined3d_cs
*
cs
,
const
void
*
data
)
{
{
const
struct
wined3d_cs_set_viewport
*
op
=
data
;
const
struct
wined3d_cs_set_viewport
*
op
=
data
;
...
@@ -880,6 +908,7 @@ static void (* const wined3d_cs_op_handlers[])(struct wined3d_cs *cs, const void
...
@@ -880,6 +908,7 @@ static void (* const wined3d_cs_op_handlers[])(struct wined3d_cs *cs, const void
/* WINED3D_CS_OP_PRESENT */
wined3d_cs_exec_present
,
/* WINED3D_CS_OP_PRESENT */
wined3d_cs_exec_present
,
/* WINED3D_CS_OP_CLEAR */
wined3d_cs_exec_clear
,
/* WINED3D_CS_OP_CLEAR */
wined3d_cs_exec_clear
,
/* WINED3D_CS_OP_DRAW */
wined3d_cs_exec_draw
,
/* WINED3D_CS_OP_DRAW */
wined3d_cs_exec_draw
,
/* WINED3D_CS_OP_SET_PREDICATION */
wined3d_cs_exec_set_predication
,
/* WINED3D_CS_OP_SET_VIEWPORT */
wined3d_cs_exec_set_viewport
,
/* WINED3D_CS_OP_SET_VIEWPORT */
wined3d_cs_exec_set_viewport
,
/* WINED3D_CS_OP_SET_SCISSOR_RECT */
wined3d_cs_exec_set_scissor_rect
,
/* WINED3D_CS_OP_SET_SCISSOR_RECT */
wined3d_cs_exec_set_scissor_rect
,
/* WINED3D_CS_OP_SET_RENDERTARGET_VIEW */
wined3d_cs_exec_set_rendertarget_view
,
/* WINED3D_CS_OP_SET_RENDERTARGET_VIEW */
wined3d_cs_exec_set_rendertarget_view
,
...
...
dlls/wined3d/device.c
View file @
fdf60e51
...
@@ -3333,6 +3333,27 @@ HRESULT CDECL wined3d_device_clear(struct wined3d_device *device, DWORD rect_cou
...
@@ -3333,6 +3333,27 @@ HRESULT CDECL wined3d_device_clear(struct wined3d_device *device, DWORD rect_cou
return
WINED3D_OK
;
return
WINED3D_OK
;
}
}
void
CDECL
wined3d_device_set_predication
(
struct
wined3d_device
*
device
,
struct
wined3d_query
*
predicate
,
BOOL
value
)
{
struct
wined3d_query
*
prev
;
TRACE
(
"device %p, predicate %p, value %#x.
\n
"
,
device
,
predicate
,
value
);
prev
=
device
->
update_state
->
predicate
;
if
(
predicate
)
{
FIXME
(
"Predicated rendering not implemented.
\n
"
);
wined3d_query_incref
(
predicate
);
}
device
->
update_state
->
predicate
=
predicate
;
device
->
update_state
->
predicate_value
=
value
;
if
(
!
device
->
recording
)
wined3d_cs_emit_set_predication
(
device
->
cs
,
predicate
,
value
);
if
(
prev
)
wined3d_query_decref
(
prev
);
}
void
CDECL
wined3d_device_set_primitive_type
(
struct
wined3d_device
*
device
,
void
CDECL
wined3d_device_set_primitive_type
(
struct
wined3d_device
*
device
,
enum
wined3d_primitive_type
primitive_type
)
enum
wined3d_primitive_type
primitive_type
)
{
{
...
...
dlls/wined3d/wined3d.spec
View file @
fdf60e51
...
@@ -126,6 +126,7 @@
...
@@ -126,6 +126,7 @@
@ cdecl wined3d_device_set_multithreaded(ptr)
@ cdecl wined3d_device_set_multithreaded(ptr)
@ cdecl wined3d_device_set_npatch_mode(ptr float)
@ cdecl wined3d_device_set_npatch_mode(ptr float)
@ cdecl wined3d_device_set_pixel_shader(ptr ptr)
@ cdecl wined3d_device_set_pixel_shader(ptr ptr)
@ cdecl wined3d_device_set_predication(ptr ptr long)
@ cdecl wined3d_device_set_primitive_type(ptr long)
@ cdecl wined3d_device_set_primitive_type(ptr long)
@ cdecl wined3d_device_set_ps_cb(ptr long ptr)
@ cdecl wined3d_device_set_ps_cb(ptr long ptr)
@ cdecl wined3d_device_set_ps_consts_b(ptr long ptr long)
@ cdecl wined3d_device_set_ps_consts_b(ptr long ptr long)
...
...
dlls/wined3d/wined3d_private.h
View file @
fdf60e51
...
@@ -1862,6 +1862,8 @@ struct wined3d_state
...
@@ -1862,6 +1862,8 @@ struct wined3d_state
INT
base_vertex_index
;
INT
base_vertex_index
;
INT
load_base_vertex_index
;
/* Non-indexed drawing needs 0 here, indexed needs base_vertex_index. */
INT
load_base_vertex_index
;
/* Non-indexed drawing needs 0 here, indexed needs base_vertex_index. */
GLenum
gl_primitive_type
;
GLenum
gl_primitive_type
;
struct
wined3d_query
*
predicate
;
BOOL
predicate_value
;
struct
wined3d_shader
*
shader
[
WINED3D_SHADER_TYPE_COUNT
];
struct
wined3d_shader
*
shader
[
WINED3D_SHADER_TYPE_COUNT
];
struct
wined3d_buffer
*
cb
[
WINED3D_SHADER_TYPE_COUNT
][
MAX_CONSTANT_BUFFERS
];
struct
wined3d_buffer
*
cb
[
WINED3D_SHADER_TYPE_COUNT
][
MAX_CONSTANT_BUFFERS
];
...
@@ -2508,6 +2510,8 @@ void wined3d_cs_emit_set_depth_stencil_view(struct wined3d_cs *cs,
...
@@ -2508,6 +2510,8 @@ void wined3d_cs_emit_set_depth_stencil_view(struct wined3d_cs *cs,
void
wined3d_cs_emit_set_index_buffer
(
struct
wined3d_cs
*
cs
,
struct
wined3d_buffer
*
buffer
,
void
wined3d_cs_emit_set_index_buffer
(
struct
wined3d_cs
*
cs
,
struct
wined3d_buffer
*
buffer
,
enum
wined3d_format_id
format_id
)
DECLSPEC_HIDDEN
;
enum
wined3d_format_id
format_id
)
DECLSPEC_HIDDEN
;
void
wined3d_cs_emit_set_material
(
struct
wined3d_cs
*
cs
,
const
struct
wined3d_material
*
material
)
DECLSPEC_HIDDEN
;
void
wined3d_cs_emit_set_material
(
struct
wined3d_cs
*
cs
,
const
struct
wined3d_material
*
material
)
DECLSPEC_HIDDEN
;
void
wined3d_cs_emit_set_predication
(
struct
wined3d_cs
*
cs
,
struct
wined3d_query
*
predicate
,
BOOL
value
)
DECLSPEC_HIDDEN
;
void
wined3d_cs_emit_set_render_state
(
struct
wined3d_cs
*
cs
,
void
wined3d_cs_emit_set_render_state
(
struct
wined3d_cs
*
cs
,
enum
wined3d_render_state
state
,
DWORD
value
)
DECLSPEC_HIDDEN
;
enum
wined3d_render_state
state
,
DWORD
value
)
DECLSPEC_HIDDEN
;
void
wined3d_cs_emit_set_rendertarget_view
(
struct
wined3d_cs
*
cs
,
unsigned
int
view_idx
,
void
wined3d_cs_emit_set_rendertarget_view
(
struct
wined3d_cs
*
cs
,
unsigned
int
view_idx
,
...
...
include/wine/wined3d.h
View file @
fdf60e51
...
@@ -2237,6 +2237,8 @@ void __cdecl wined3d_device_set_material(struct wined3d_device *device, const st
...
@@ -2237,6 +2237,8 @@ void __cdecl wined3d_device_set_material(struct wined3d_device *device, const st
void
__cdecl
wined3d_device_set_multithreaded
(
struct
wined3d_device
*
device
);
void
__cdecl
wined3d_device_set_multithreaded
(
struct
wined3d_device
*
device
);
HRESULT
__cdecl
wined3d_device_set_npatch_mode
(
struct
wined3d_device
*
device
,
float
segments
);
HRESULT
__cdecl
wined3d_device_set_npatch_mode
(
struct
wined3d_device
*
device
,
float
segments
);
void
__cdecl
wined3d_device_set_pixel_shader
(
struct
wined3d_device
*
device
,
struct
wined3d_shader
*
shader
);
void
__cdecl
wined3d_device_set_pixel_shader
(
struct
wined3d_device
*
device
,
struct
wined3d_shader
*
shader
);
void
__cdecl
wined3d_device_set_predication
(
struct
wined3d_device
*
device
,
struct
wined3d_query
*
predicate
,
BOOL
value
);
void
__cdecl
wined3d_device_set_primitive_type
(
struct
wined3d_device
*
device
,
void
__cdecl
wined3d_device_set_primitive_type
(
struct
wined3d_device
*
device
,
enum
wined3d_primitive_type
primitive_topology
);
enum
wined3d_primitive_type
primitive_topology
);
void
__cdecl
wined3d_device_set_ps_cb
(
struct
wined3d_device
*
device
,
UINT
idx
,
struct
wined3d_buffer
*
buffer
);
void
__cdecl
wined3d_device_set_ps_cb
(
struct
wined3d_device
*
device
,
UINT
idx
,
struct
wined3d_buffer
*
buffer
);
...
...
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