#include "main/mtypes.h"
#include "program/prog_parameter.h"
+#include "main/shaderapi.h"
#include "brw_context.h"
#include "brw_state.h"
struct brw_stage_state *stage_state = &brw->gs.base;
/* BRW_NEW_GEOMETRY_PROGRAM */
- struct brw_geometry_program *gp =
- (struct brw_geometry_program *) brw->geometry_program;
+ struct brw_program *gp =
+ (struct brw_program *) brw->programs[MESA_SHADER_GEOMETRY];
if (!gp)
return;
- /* CACHE_NEW_GS_PROG */
- const struct brw_stage_prog_data *prog_data = &brw->gs.prog_data->base.base;
+ /* BRW_NEW_GS_PROG_DATA */
+ const struct brw_stage_prog_data *prog_data = brw->gs.base.prog_data;
+ _mesa_shader_write_subroutine_indices(&brw->ctx, MESA_SHADER_GEOMETRY);
/* _NEW_PROGRAM_CONSTANTS */
- brw_upload_pull_constants(brw, BRW_NEW_GS_CONSTBUF, &gp->program.Base,
- stage_state, prog_data, false);
+ brw_upload_pull_constants(brw, BRW_NEW_GS_CONSTBUF, &gp->program,
+ stage_state, prog_data);
}
const struct brw_tracked_state brw_gs_pull_constants = {
.dirty = {
.mesa = _NEW_PROGRAM_CONSTANTS,
.brw = BRW_NEW_BATCH |
- BRW_NEW_GEOMETRY_PROGRAM,
- .cache = CACHE_NEW_GS_PROG,
+ BRW_NEW_GEOMETRY_PROGRAM |
+ BRW_NEW_GS_PROG_DATA,
},
.emit = brw_upload_gs_pull_constants,
};
struct gl_context *ctx = &brw->ctx;
/* _NEW_PROGRAM */
- struct gl_shader_program *prog =
+ struct gl_program *prog =
ctx->_Shader->CurrentProgram[MESA_SHADER_GEOMETRY];
- if (!prog)
- return;
+ /* BRW_NEW_GS_PROG_DATA */
+ struct brw_stage_prog_data *prog_data = brw->gs.base.prog_data;
- /* CACHE_NEW_GS_PROG */
- brw_upload_ubo_surfaces(brw, prog->_LinkedShaders[MESA_SHADER_GEOMETRY],
- &brw->gs.base, &brw->gs.prog_data->base.base);
+ brw_upload_ubo_surfaces(brw, prog, &brw->gs.base, prog_data);
}
const struct brw_tracked_state brw_gs_ubo_surfaces = {
.dirty = {
.mesa = _NEW_PROGRAM,
.brw = BRW_NEW_BATCH |
+ BRW_NEW_GS_PROG_DATA |
BRW_NEW_UNIFORM_BUFFER,
- .cache = CACHE_NEW_GS_PROG,
},
.emit = brw_upload_gs_ubo_surfaces,
};
static void
-brw_upload_gs_abo_surfaces(struct brw_context *brw)
+brw_upload_gs_image_surfaces(struct brw_context *brw)
{
- struct gl_context *ctx = &brw->ctx;
- /* _NEW_PROGRAM */
- struct gl_shader_program *prog =
- ctx->_Shader->CurrentProgram[MESA_SHADER_GEOMETRY];
+ /* BRW_NEW_GEOMETRY_PROGRAM */
+ const struct gl_program *gp = brw->programs[MESA_SHADER_GEOMETRY];
- if (prog) {
- /* CACHE_NEW_GS_PROG */
- brw_upload_abo_surfaces(brw, prog, &brw->gs.base,
- &brw->gs.prog_data->base.base);
+ if (gp) {
+ /* BRW_NEW_GS_PROG_DATA, BRW_NEW_IMAGE_UNITS, _NEW_TEXTURE */
+ brw_upload_image_surfaces(brw, gp, &brw->gs.base,
+ brw->gs.base.prog_data);
}
}
-const struct brw_tracked_state brw_gs_abo_surfaces = {
+const struct brw_tracked_state brw_gs_image_surfaces = {
.dirty = {
- .mesa = _NEW_PROGRAM,
- .brw = BRW_NEW_ATOMIC_BUFFER |
- BRW_NEW_BATCH,
- .cache = CACHE_NEW_GS_PROG,
+ .mesa = _NEW_TEXTURE,
+ .brw = BRW_NEW_BATCH |
+ BRW_NEW_AUX_STATE |
+ BRW_NEW_GEOMETRY_PROGRAM |
+ BRW_NEW_GS_PROG_DATA |
+ BRW_NEW_IMAGE_UNITS,
},
- .emit = brw_upload_gs_abo_surfaces,
+ .emit = brw_upload_gs_image_surfaces,
};