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
047d607e
Commit
047d607e
authored
Dec 07, 2012
by
Henri Verbeet
Committed by
Alexandre Julliard
Dec 07, 2012
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
d3d10core: Implement d3d10_device_GSSetSamplers().
parent
fb37ac56
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
45 additions
and
1 deletion
+45
-1
device.c
dlls/d3d10core/device.c
+12
-1
device.c
dlls/wined3d/device.c
+21
-0
stateblock.c
dlls/wined3d/stateblock.c
+9
-0
wined3d.spec
dlls/wined3d/wined3d.spec
+1
-0
wined3d_private.h
dlls/wined3d/wined3d_private.h
+1
-0
wined3d.h
include/wine/wined3d.h
+1
-0
No files found.
dlls/d3d10core/device.c
View file @
047d607e
...
...
@@ -357,8 +357,19 @@ static void STDMETHODCALLTYPE d3d10_device_GSSetShaderResources(ID3D10Device *if
static
void
STDMETHODCALLTYPE
d3d10_device_GSSetSamplers
(
ID3D10Device
*
iface
,
UINT
start_slot
,
UINT
sampler_count
,
ID3D10SamplerState
*
const
*
samplers
)
{
FIXME
(
"iface %p, start_slot %u, sampler_count %u, samplers %p stub!
\n
"
,
struct
d3d10_device
*
device
=
impl_from_ID3D10Device
(
iface
);
unsigned
int
i
;
TRACE
(
"iface %p, start_slot %u, sampler_count %u, samplers %p.
\n
"
,
iface
,
start_slot
,
sampler_count
,
samplers
);
for
(
i
=
0
;
i
<
sampler_count
;
++
i
)
{
struct
d3d10_sampler_state
*
sampler
=
unsafe_impl_from_ID3D10SamplerState
(
samplers
[
i
]);
wined3d_device_set_gs_sampler
(
device
->
wined3d_device
,
start_slot
+
i
,
sampler
?
sampler
->
wined3d_sampler
:
NULL
);
}
}
static
void
STDMETHODCALLTYPE
d3d10_device_OMSetRenderTargets
(
ID3D10Device
*
iface
,
...
...
dlls/wined3d/device.c
View file @
047d607e
...
...
@@ -3267,6 +3267,27 @@ struct wined3d_buffer * CDECL wined3d_device_get_gs_cb(const struct wined3d_devi
return
device
->
stateBlock
->
state
.
gs_cb
[
idx
];
}
void
CDECL
wined3d_device_set_gs_sampler
(
struct
wined3d_device
*
device
,
UINT
idx
,
struct
wined3d_sampler
*
sampler
)
{
struct
wined3d_sampler
*
prev
;
TRACE
(
"device %p, idx %u, sampler %p.
\n
"
,
device
,
idx
,
sampler
);
if
(
idx
>=
MAX_SAMPLER_OBJECTS
)
{
WARN
(
"Invalid sampler index %u.
\n
"
,
idx
);
return
;
}
prev
=
device
->
updateStateBlock
->
state
.
gs_sampler
[
idx
];
device
->
updateStateBlock
->
state
.
gs_sampler
[
idx
]
=
sampler
;
if
(
sampler
)
wined3d_sampler_incref
(
sampler
);
if
(
prev
)
wined3d_sampler_decref
(
prev
);
}
/* Context activation is done by the caller. */
/* Do not call while under the GL lock. */
#define copy_and_next(dest, src, size) memcpy(dest, src, size); dest += (size)
...
...
dlls/wined3d/stateblock.c
View file @
047d607e
...
...
@@ -555,6 +555,15 @@ void stateblock_unbind_resources(struct wined3d_stateblock *stateblock)
}
}
for
(
i
=
0
;
i
<
MAX_SAMPLER_OBJECTS
;
++
i
)
{
if
((
sampler
=
state
->
gs_sampler
[
i
]))
{
state
->
gs_sampler
[
i
]
=
NULL
;
wined3d_sampler_decref
(
sampler
);
}
}
if
((
shader
=
state
->
pixel_shader
))
{
state
->
pixel_shader
=
NULL
;
...
...
dlls/wined3d/wined3d.spec
View file @
047d607e
...
...
@@ -120,6 +120,7 @@
@ cdecl wined3d_device_set_gamma_ramp(ptr long long ptr)
@ cdecl wined3d_device_set_geometry_shader(ptr ptr)
@ cdecl wined3d_device_set_gs_cb(ptr long ptr)
@ cdecl wined3d_device_set_gs_sampler(ptr long ptr)
@ cdecl wined3d_device_set_index_buffer(ptr ptr long)
@ cdecl wined3d_device_set_light(ptr long ptr)
@ cdecl wined3d_device_set_light_enable(ptr long long)
...
...
dlls/wined3d/wined3d_private.h
View file @
047d607e
...
...
@@ -2315,6 +2315,7 @@ struct wined3d_state
struct
wined3d_shader
*
geometry_shader
;
struct
wined3d_buffer
*
gs_cb
[
MAX_CONSTANT_BUFFERS
];
struct
wined3d_sampler
*
gs_sampler
[
MAX_SAMPLER_OBJECTS
];
struct
wined3d_shader
*
pixel_shader
;
struct
wined3d_buffer
*
ps_cb
[
MAX_CONSTANT_BUFFERS
];
...
...
include/wine/wined3d.h
View file @
047d607e
...
...
@@ -2211,6 +2211,7 @@ void __cdecl wined3d_device_set_gamma_ramp(const struct wined3d_device *device,
UINT
swapchain_idx
,
DWORD
flags
,
const
struct
wined3d_gamma_ramp
*
ramp
);
void
__cdecl
wined3d_device_set_geometry_shader
(
struct
wined3d_device
*
device
,
struct
wined3d_shader
*
shader
);
void
__cdecl
wined3d_device_set_gs_cb
(
struct
wined3d_device
*
device
,
UINT
idx
,
struct
wined3d_buffer
*
buffer
);
void
__cdecl
wined3d_device_set_gs_sampler
(
struct
wined3d_device
*
device
,
UINT
idx
,
struct
wined3d_sampler
*
sampler
);
void
__cdecl
wined3d_device_set_index_buffer
(
struct
wined3d_device
*
device
,
struct
wined3d_buffer
*
index_buffer
,
enum
wined3d_format_id
format_id
);
HRESULT
__cdecl
wined3d_device_set_light
(
struct
wined3d_device
*
device
,
...
...
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