Commit a2954a71 authored by Józef Kucia's avatar Józef Kucia Committed by Alexandre Julliard

wined3d: Avoid passing gl_info to compile_state_table().

parent 3ef1c469
...@@ -5358,7 +5358,7 @@ HRESULT device_init(struct wined3d_device *device, struct wined3d *wined3d, ...@@ -5358,7 +5358,7 @@ HRESULT device_init(struct wined3d_device *device, struct wined3d *wined3d,
if (vertex_pipeline->vp_states && fragment_pipeline->states if (vertex_pipeline->vp_states && fragment_pipeline->states
&& FAILED(hr = compile_state_table(device->StateTable, device->multistate_funcs, && FAILED(hr = compile_state_table(device->StateTable, device->multistate_funcs,
&adapter->gl_info, &adapter->d3d_info, vertex_pipeline, &adapter->d3d_info, adapter->gl_info.supported, vertex_pipeline,
fragment_pipeline, misc_state_template))) fragment_pipeline, misc_state_template)))
{ {
ERR("Failed to compile state table, hr %#x.\n", hr); ERR("Failed to compile state table, hr %#x.\n", hr);
......
...@@ -5520,7 +5520,7 @@ static void validate_state_table(struct StateEntry *state_table) ...@@ -5520,7 +5520,7 @@ static void validate_state_table(struct StateEntry *state_table)
} }
HRESULT compile_state_table(struct StateEntry *StateTable, APPLYSTATEFUNC **dev_multistate_funcs, HRESULT compile_state_table(struct StateEntry *StateTable, APPLYSTATEFUNC **dev_multistate_funcs,
const struct wined3d_gl_info *gl_info, const struct wined3d_d3d_info *d3d_info, const struct wined3d_d3d_info *d3d_info, const BOOL *supported_extensions,
const struct wined3d_vertex_pipe_ops *vertex, const struct fragment_pipeline *fragment, const struct wined3d_vertex_pipe_ops *vertex, const struct fragment_pipeline *fragment,
const struct StateEntryTemplate *misc) const struct StateEntryTemplate *misc)
{ {
...@@ -5563,7 +5563,7 @@ HRESULT compile_state_table(struct StateEntry *StateTable, APPLYSTATEFUNC **dev_ ...@@ -5563,7 +5563,7 @@ HRESULT compile_state_table(struct StateEntry *StateTable, APPLYSTATEFUNC **dev_
*/ */
if(set[cur[i].state]) continue; if(set[cur[i].state]) continue;
/* Skip state lines depending on unsupported extensions */ /* Skip state lines depending on unsupported extensions */
if (!gl_info->supported[cur[i].extension]) continue; if (!supported_extensions[cur[i].extension]) continue;
set[cur[i].state] = TRUE; set[cur[i].state] = TRUE;
/* In some cases having an extension means that nothing has to be /* In some cases having an extension means that nothing has to be
* done for a state, e.g. if GL_ARB_texture_non_power_of_two is * done for a state, e.g. if GL_ARB_texture_non_power_of_two is
......
...@@ -2037,7 +2037,7 @@ struct StateEntryTemplate ...@@ -2037,7 +2037,7 @@ struct StateEntryTemplate
{ {
DWORD state; DWORD state;
struct StateEntry content; struct StateEntry content;
enum wined3d_gl_extension extension; unsigned int extension;
}; };
#define WINED3D_FRAGMENT_CAP_PROJ_CONTROL 0x00000001 #define WINED3D_FRAGMENT_CAP_PROJ_CONTROL 0x00000001
...@@ -2108,7 +2108,7 @@ extern const struct wined3d_vertex_pipe_ops glsl_vertex_pipe DECLSPEC_HIDDEN; ...@@ -2108,7 +2108,7 @@ extern const struct wined3d_vertex_pipe_ops glsl_vertex_pipe DECLSPEC_HIDDEN;
/* "Base" state table */ /* "Base" state table */
HRESULT compile_state_table(struct StateEntry *StateTable, APPLYSTATEFUNC **dev_multistate_funcs, HRESULT compile_state_table(struct StateEntry *StateTable, APPLYSTATEFUNC **dev_multistate_funcs,
const struct wined3d_gl_info *gl_info, const struct wined3d_d3d_info *d3d_info, const struct wined3d_d3d_info *d3d_info, const BOOL *supported_extensions,
const struct wined3d_vertex_pipe_ops *vertex, const struct fragment_pipeline *fragment, const struct wined3d_vertex_pipe_ops *vertex, const struct fragment_pipeline *fragment,
const struct StateEntryTemplate *misc) DECLSPEC_HIDDEN; const struct StateEntryTemplate *misc) DECLSPEC_HIDDEN;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment