projects
/
mesa.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
i965: Indroduce brw_finish_drawing.
[mesa.git]
/
src
/
mesa
/
drivers
/
dri
/
i965
/
brw_vs_surface_state.c
diff --git
a/src/mesa/drivers/dri/i965/brw_vs_surface_state.c
b/src/mesa/drivers/dri/i965/brw_vs_surface_state.c
index 6a97cd4a13f7d240a21f49eced80d225fce5ab92..23f841ecc3105fe8b1f10f55fe42411b7a8e3149 100644
(file)
--- a/
src/mesa/drivers/dri/i965/brw_vs_surface_state.c
+++ b/
src/mesa/drivers/dri/i965/brw_vs_surface_state.c
@@
-74,7
+74,7
@@
brw_upload_pull_constants(struct brw_context *brw,
/* BRW_NEW_*_PROG_DATA | _NEW_PROGRAM_CONSTANTS */
uint32_t size = prog_data->nr_pull_params * 4;
/* BRW_NEW_*_PROG_DATA | _NEW_PROGRAM_CONSTANTS */
uint32_t size = prog_data->nr_pull_params * 4;
-
drm_intel
_bo *const_bo = NULL;
+
struct brw
_bo *const_bo = NULL;
uint32_t const_offset;
gl_constant_value *constants = intel_upload_space(brw, size, 64,
&const_bo, &const_offset);
uint32_t const_offset;
gl_constant_value *constants = intel_upload_space(brw, size, 64,
&const_bo, &const_offset);
@@
-95,7
+95,7
@@
brw_upload_pull_constants(struct brw_context *brw,
brw_create_constant_surface(brw, const_bo, const_offset, size,
&stage_state->surf_offset[surf_index]);
brw_create_constant_surface(brw, const_bo, const_offset, size,
&stage_state->surf_offset[surf_index]);
-
drm_intel
_bo_unreference(const_bo);
+
brw
_bo_unreference(const_bo);
brw->ctx.NewDriverState |= brw_new_constbuf;
}
brw->ctx.NewDriverState |= brw_new_constbuf;
}
@@
-113,7
+113,8
@@
brw_upload_vs_pull_constants(struct brw_context *brw)
struct brw_stage_state *stage_state = &brw->vs.base;
/* BRW_NEW_VERTEX_PROGRAM */
struct brw_stage_state *stage_state = &brw->vs.base;
/* BRW_NEW_VERTEX_PROGRAM */
- struct brw_program *vp = (struct brw_program *) brw->vertex_program;
+ struct brw_program *vp =
+ (struct brw_program *) brw->programs[MESA_SHADER_VERTEX];
/* BRW_NEW_VS_PROG_DATA */
const struct brw_stage_prog_data *prog_data = brw->vs.base.prog_data;
/* BRW_NEW_VS_PROG_DATA */
const struct brw_stage_prog_data *prog_data = brw->vs.base.prog_data;
@@
-128,7
+129,6
@@
const struct brw_tracked_state brw_vs_pull_constants = {
.dirty = {
.mesa = _NEW_PROGRAM_CONSTANTS,
.brw = BRW_NEW_BATCH |
.dirty = {
.mesa = _NEW_PROGRAM_CONSTANTS,
.brw = BRW_NEW_BATCH |
- BRW_NEW_BLORP |
BRW_NEW_VERTEX_PROGRAM |
BRW_NEW_VS_PROG_DATA,
},
BRW_NEW_VERTEX_PROGRAM |
BRW_NEW_VS_PROG_DATA,
},
@@
-140,22
+140,16
@@
brw_upload_vs_ubo_surfaces(struct brw_context *brw)
{
struct gl_context *ctx = &brw->ctx;
/* _NEW_PROGRAM */
{
struct gl_context *ctx = &brw->ctx;
/* _NEW_PROGRAM */
- struct gl_shader_program *prog =
- ctx->_Shader->CurrentProgram[MESA_SHADER_VERTEX];
-
- if (!prog)
- return;
+ struct gl_program *prog = ctx->_Shader->CurrentProgram[MESA_SHADER_VERTEX];
/* BRW_NEW_VS_PROG_DATA */
/* BRW_NEW_VS_PROG_DATA */
- brw_upload_ubo_surfaces(brw, prog->_LinkedShaders[MESA_SHADER_VERTEX],
- &brw->vs.base, brw->vs.base.prog_data);
+ brw_upload_ubo_surfaces(brw, prog, &brw->vs.base, brw->vs.base.prog_data);
}
const struct brw_tracked_state brw_vs_ubo_surfaces = {
.dirty = {
.mesa = _NEW_PROGRAM,
.brw = BRW_NEW_BATCH |
}
const struct brw_tracked_state brw_vs_ubo_surfaces = {
.dirty = {
.mesa = _NEW_PROGRAM,
.brw = BRW_NEW_BATCH |
- BRW_NEW_BLORP |
BRW_NEW_UNIFORM_BUFFER |
BRW_NEW_VS_PROG_DATA,
},
BRW_NEW_UNIFORM_BUFFER |
BRW_NEW_VS_PROG_DATA,
},
@@
-165,15
+159,12
@@
const struct brw_tracked_state brw_vs_ubo_surfaces = {
static void
brw_upload_vs_abo_surfaces(struct brw_context *brw)
{
static void
brw_upload_vs_abo_surfaces(struct brw_context *brw)
{
- struct gl_context *ctx = &brw->ctx;
/* _NEW_PROGRAM */
/* _NEW_PROGRAM */
- struct gl_shader_program *prog =
- ctx->_Shader->CurrentProgram[MESA_SHADER_VERTEX];
+ const struct gl_program *vp = brw->programs[MESA_SHADER_VERTEX];
- if (
prog
) {
+ if (
vp
) {
/* BRW_NEW_VS_PROG_DATA */
/* BRW_NEW_VS_PROG_DATA */
- brw_upload_abo_surfaces(brw, prog->_LinkedShaders[MESA_SHADER_VERTEX],
- &brw->vs.base, brw->vs.base.prog_data);
+ brw_upload_abo_surfaces(brw, vp, &brw->vs.base, brw->vs.base.prog_data);
}
}
}
}
@@
-182,7
+173,6
@@
const struct brw_tracked_state brw_vs_abo_surfaces = {
.mesa = _NEW_PROGRAM,
.brw = BRW_NEW_ATOMIC_BUFFER |
BRW_NEW_BATCH |
.mesa = _NEW_PROGRAM,
.brw = BRW_NEW_ATOMIC_BUFFER |
BRW_NEW_BATCH |
- BRW_NEW_BLORP |
BRW_NEW_VS_PROG_DATA,
},
.emit = brw_upload_vs_abo_surfaces,
BRW_NEW_VS_PROG_DATA,
},
.emit = brw_upload_vs_abo_surfaces,
@@
-191,15
+181,13
@@
const struct brw_tracked_state brw_vs_abo_surfaces = {
static void
brw_upload_vs_image_surfaces(struct brw_context *brw)
{
static void
brw_upload_vs_image_surfaces(struct brw_context *brw)
{
- struct gl_context *ctx = &brw->ctx;
/* BRW_NEW_VERTEX_PROGRAM */
/* BRW_NEW_VERTEX_PROGRAM */
- struct gl_shader_program *prog =
- ctx->_Shader->CurrentProgram[MESA_SHADER_VERTEX];
+ const struct gl_program *vp = brw->programs[MESA_SHADER_VERTEX];
- if (
prog
) {
+ if (
vp
) {
/* BRW_NEW_VS_PROG_DATA, BRW_NEW_IMAGE_UNITS, _NEW_TEXTURE */
/* BRW_NEW_VS_PROG_DATA, BRW_NEW_IMAGE_UNITS, _NEW_TEXTURE */
- brw_upload_image_surfaces(brw,
prog->_LinkedShaders[MESA_SHADER_VERTEX]
,
-
&brw->vs.base,
brw->vs.base.prog_data);
+ brw_upload_image_surfaces(brw,
vp, &brw->vs.base
,
+ brw->vs.base.prog_data);
}
}
}
}
@@
-207,7
+195,7
@@
const struct brw_tracked_state brw_vs_image_surfaces = {
.dirty = {
.mesa = _NEW_TEXTURE,
.brw = BRW_NEW_BATCH |
.dirty = {
.mesa = _NEW_TEXTURE,
.brw = BRW_NEW_BATCH |
- BRW_NEW_
BLORP
|
+ BRW_NEW_
AUX_STATE
|
BRW_NEW_IMAGE_UNITS |
BRW_NEW_VERTEX_PROGRAM |
BRW_NEW_VS_PROG_DATA,
BRW_NEW_IMAGE_UNITS |
BRW_NEW_VERTEX_PROGRAM |
BRW_NEW_VS_PROG_DATA,