ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

wined3d: Get rid of vs_selected_mode / ps_selected_mode from struct wined3d_device. 

These are only used by wined3d_shader_create_vs() /
wined3d_shader_create_ps(), but they're redundant there since the "none"
shader backend doesn't support any shader version.
This commit is contained in:
Henri Verbeet 2013-01-18 12:05:25 +01:00 committed by Alexandre Julliard
parent c10c9fba76
commit e73aa3e83d
3 changed files with 0 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
dlls/wined3d/device.c
View File

@ -5652,7 +5652,6 @@ HRESULT device_init(struct wined3d_device *device, struct wined3d *wined3d,
for (i = 0; i < PATCHMAP_SIZE; ++i) list_init(&device->patches[i]);
select_shader_mode(&adapter->gl_info, &device->ps_selected_mode, &device->vs_selected_mode);
device->shader_backend = adapter->shader_backend;
device->shader_backend->shader_get_caps(&adapter->gl_info, &shader_caps);
device->vs_version = shader_caps.vs_version;

6
dlls/wined3d/shader.c
View File

@ -2341,9 +2341,6 @@ HRESULT CDECL wined3d_shader_create_ps(struct wined3d_device *device, const DWOR
TRACE("device %p, byte_code %p, output_signature %p, parent %p, parent_ops %p, shader %p.\n",
device, byte_code, output_signature, parent, parent_ops, shader);
if (device->ps_selected_mode == SHADER_NONE)
return WINED3DERR_INVALIDCALL;
object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*object));
if (!object)
{
@ -2375,9 +2372,6 @@ HRESULT CDECL wined3d_shader_create_vs(struct wined3d_device *device, const DWOR
TRACE("device %p, byte_code %p, output_signature %p, parent %p, parent_ops %p, shader %p.\n",
device, byte_code, output_signature, parent, parent_ops, shader);
if (device->vs_selected_mode == SHADER_NONE)
return WINED3DERR_INVALIDCALL;
object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*object));
if (!object)
{

3
dlls/wined3d/wined3d_private.h
View File

@ -1705,9 +1705,6 @@ struct wined3d_device
/* X and GL Information */
GLenum offscreenBuffer;
/* Selected capabilities */
int vs_selected_mode;
int ps_selected_mode;
const struct wined3d_shader_backend_ops *shader_backend;
void *shader_priv;
void *fragment_priv;