Module: wine Branch: master Commit: e73aa3e83de5ba0abbe71be9fa45c6352e7e172a URL: http://source.winehq.org/git/wine.git/?a=commit;h=e73aa3e83de5ba0abbe71be9fa...
Author: Henri Verbeet hverbeet@codeweavers.com Date: Fri Jan 18 12:05:25 2013 +0100
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.
---
dlls/wined3d/device.c | 1 - dlls/wined3d/shader.c | 6 ------ dlls/wined3d/wined3d_private.h | 3 --- 3 files changed, 0 insertions(+), 10 deletions(-)
diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 40ffe66..984fa3b 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -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; diff --git a/dlls/wined3d/shader.c b/dlls/wined3d/shader.c index d05615b..abbf837 100644 --- a/dlls/wined3d/shader.c +++ b/dlls/wined3d/shader.c @@ -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) { diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index af5ad2f..8fbd16e 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -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;