fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-05-04 22:49:13 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

iris: move iris_shader_state from ice->shaders.state to ice->state.shaders

Browse source 
it's more state related...
This commit is contained in:
Kenneth Graunke 2018-08-18 23:39:48 -07:00
parent 33701d5341
commit 410a555bfb
2 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/gallium/drivers/iris/iris_context.h
View file

@ -316,8 +316,6 @@ struct iris_context {
struct iris_compiled_shader *prog[MESA_SHADER_STAGES];
struct brw_vue_map *last_vue_map;
struct iris_shader_state state[MESA_SHADER_STAGES];
struct u_upload_mgr *uploader;
struct hash_table *cache;
@ -344,6 +342,8 @@ struct iris_context {
/** GenX-specific current state */
struct iris_genx_state *genx;
struct iris_shader_state shaders[MESA_SHADER_STAGES];
struct iris_state_ref sampler_table[MESA_SHADER_STAGES];
bool need_border_colors;
struct iris_sampler_state *samplers[MESA_SHADER_STAGES][IRIS_MAX_TEXTURE_SAMPLERS];

10
src/gallium/drivers/iris/iris_state.c
View file

@ -1730,7 +1730,7 @@ iris_set_constant_buffer(struct pipe_context *ctx,
struct iris_context *ice = (struct iris_context *) ctx;
struct iris_screen *screen = (struct iris_screen *)ctx->screen;
gl_shader_stage stage = stage_from_pipe(p_stage);
struct iris_shader_state *shs = &ice->shaders.state[stage];
struct iris_shader_state *shs = &ice->state.shaders[stage];
struct iris_const_buffer *cbuf = &shs->constbuf[index];
if (input && (input->buffer || input->user_buffer)) {
@ -1788,7 +1788,7 @@ iris_set_shader_buffers(struct pipe_context *ctx,
struct iris_context *ice = (struct iris_context *) ctx;
struct iris_screen *screen = (struct iris_screen *)ctx->screen;
gl_shader_stage stage = stage_from_pipe(p_stage);
struct iris_shader_state *shs = &ice->shaders.state[stage];
struct iris_shader_state *shs = &ice->state.shaders[stage];
for (unsigned i = 0; i < count; i++) {
if (buffers && buffers[i].buffer) {
@ -3030,7 +3030,7 @@ iris_populate_binding_table(struct iris_context *ice,
return;
const struct shader_info *info = iris_get_shader_info(ice, stage);
struct iris_shader_state *shs = &ice->shaders.state[stage];
struct iris_shader_state *shs = &ice->state.shaders[stage];
//struct brw_stage_prog_data *prog_data = (void *) shader->prog_data;
uint32_t *bt_map = binder->map + binder->bt_offset[stage];
@ -3146,7 +3146,7 @@ iris_restore_context_saved_bos(struct iris_context *ice,
if (clean & (IRIS_DIRTY_CONSTANTS_VS << stage))
continue;
struct iris_shader_state *shs = &ice->shaders.state[stage];
struct iris_shader_state *shs = &ice->state.shaders[stage];
struct iris_compiled_shader *shader = ice->shaders.prog[stage];
if (!shader)
@ -3326,7 +3326,7 @@ iris_upload_render_state(struct iris_context *ice,
if (!(dirty & (IRIS_DIRTY_CONSTANTS_VS << stage)))
continue;
struct iris_shader_state *shs = &ice->shaders.state[stage];
struct iris_shader_state *shs = &ice->state.shaders[stage];
struct iris_compiled_shader *shader = ice->shaders.prog[stage];
if (!shader)