Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
wine
Manage
Activity
Members
Labels
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Package registry
Container registry
Model registry
Operate
Terraform modules
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Lorenzo Ferrillo
wine
Commits
6e4c4068
Commit
6e4c4068
authored
12 years ago
by
Henri Verbeet
Committed by
Alexandre Julliard
12 years ago
Browse files
Options
Downloads
Patches
Plain Diff
wined3d: Just return the shader from wined3d_device_get_pixel_shader().
parent
fc711d49
Branches
Branches containing commit
Tags
Tags containing commit
No related merge requests found
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
dlls/d3d8/device.c
+2
-8
2 additions, 8 deletions
dlls/d3d8/device.c
dlls/d3d9/device.c
+1
-3
1 addition, 3 deletions
dlls/d3d9/device.c
dlls/wined3d/device.c
+1
-8
1 addition, 8 deletions
dlls/wined3d/device.c
with
4 additions
and
19 deletions
dlls/d3d8/device.c
+
2
−
8
View file @
6e4c4068
...
...
@@ -2463,7 +2463,6 @@ static HRESULT WINAPI d3d8_device_GetPixelShader(IDirect3DDevice8 *iface, DWORD
{
struct
d3d8_pixel_shader
*
d3d8_shader
;
d3d8_shader
=
wined3d_shader_get_parent
(
object
);
wined3d_shader_decref
(
object
);
*
shader
=
d3d8_shader
->
handle
;
}
else
...
...
@@ -2481,7 +2480,6 @@ static HRESULT WINAPI d3d8_device_DeletePixelShader(IDirect3DDevice8 *iface, DWO
{
struct
d3d8_device
*
device
=
impl_from_IDirect3DDevice8
(
iface
);
struct
d3d8_pixel_shader
*
shader_impl
;
struct
wined3d_shader
*
cur
;
TRACE
(
"iface %p, shader %#x.
\n
"
,
iface
,
shader
);
...
...
@@ -2494,12 +2492,8 @@ static HRESULT WINAPI d3d8_device_DeletePixelShader(IDirect3DDevice8 *iface, DWO
return
D3DERR_INVALIDCALL
;
}
if
((
cur
=
wined3d_device_get_pixel_shader
(
device
->
wined3d_device
)))
{
if
(
cur
==
shader_impl
->
wined3d_shader
)
IDirect3DDevice8_SetPixelShader
(
iface
,
0
);
wined3d_shader_decref
(
cur
);
}
if
(
wined3d_device_get_pixel_shader
(
device
->
wined3d_device
)
==
shader_impl
->
wined3d_shader
)
IDirect3DDevice8_SetPixelShader
(
iface
,
0
);
wined3d_mutex_unlock
();
...
...
This diff is collapsed.
Click to expand it.
dlls/d3d9/device.c
+
1
−
3
View file @
6e4c4068
...
...
@@ -2586,13 +2586,11 @@ static HRESULT WINAPI d3d9_device_GetPixelShader(IDirect3DDevice9Ex *iface, IDir
if
(
!
shader
)
return
D3DERR_INVALIDCALL
;
wined3d_mutex_lock
();
wined3d_shader
=
wined3d_device_get_pixel_shader
(
device
->
wined3d_device
);
if
(
wined3d_shader
)
if
((
wined3d_shader
=
wined3d_device_get_pixel_shader
(
device
->
wined3d_device
)))
{
shader_impl
=
wined3d_shader_get_parent
(
wined3d_shader
);
*
shader
=
&
shader_impl
->
IDirect3DPixelShader9_iface
;
IDirect3DPixelShader9_AddRef
(
*
shader
);
wined3d_shader_decref
(
wined3d_shader
);
}
else
{
...
...
This diff is collapsed.
Click to expand it.
dlls/wined3d/device.c
+
1
−
8
View file @
6e4c4068
...
...
@@ -2862,16 +2862,9 @@ void CDECL wined3d_device_set_pixel_shader(struct wined3d_device *device, struct
struct
wined3d_shader
*
CDECL
wined3d_device_get_pixel_shader
(
const
struct
wined3d_device
*
device
)
{
struct
wined3d_shader
*
shader
;
TRACE
(
"device %p.
\n
"
,
device
);
shader
=
device
->
stateBlock
->
state
.
pixel_shader
;
if
(
shader
)
wined3d_shader_incref
(
shader
);
TRACE
(
"Returning %p.
\n
"
,
shader
);
return
shader
;
return
device
->
stateBlock
->
state
.
pixel_shader
;
}
HRESULT
CDECL
wined3d_device_set_ps_consts_b
(
struct
wined3d_device
*
device
,
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment