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

gallium: Rename PIPE_MAX_CONSTANT to PIPE_MAX_CONSTANT_BUFFERS.

Browse source
This commit is contained in:
Michal Krol 2010-01-25 13:29:33 +01:00
parent 333c035a51
commit 7c5f255201
21 changed files with 34 additions and 34 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/gallium/auxiliary/draw/draw_context.c
View file

@ -240,7 +240,7 @@ draw_set_mapped_constant_buffer(struct draw_context *draw,
{
debug_assert(shader_type == PIPE_SHADER_VERTEX ||
shader_type == PIPE_SHADER_GEOMETRY);
debug_assert(slot < PIPE_MAX_CONSTANT);
debug_assert(slot < PIPE_MAX_CONSTANT_BUFFERS);
if (shader_type == PIPE_SHADER_VERTEX) {
draw->pt.user.vs_constants[slot] = buffer;

4
src/gallium/auxiliary/draw/draw_gs.c
View file

@ -293,7 +293,7 @@ draw_geometry_fetch_outputs(struct draw_geometry_shader *shader,
void draw_geometry_shader_run(struct draw_geometry_shader *shader,
const float (*input)[4],
float (*output)[4],
const void *constants[PIPE_MAX_CONSTANT],
const void *constants[PIPE_MAX_CONSTANT_BUFFERS],
unsigned count,
unsigned input_stride,
unsigned vertex_size)
@ -304,7 +304,7 @@ void draw_geometry_shader_run(struct draw_geometry_shader *shader,
unsigned num_primitives = count/num_vertices;
unsigned inputs_from_vs = 0;
for (i = 0; i < PIPE_MAX_CONSTANT; i++) {
for (i = 0; i < PIPE_MAX_CONSTANT_BUFFERS; i++) {
machine->Consts[i] = constants[i];
}

2
src/gallium/auxiliary/draw/draw_gs.h
View file

@ -62,7 +62,7 @@ struct draw_geometry_shader {
void draw_geometry_shader_run(struct draw_geometry_shader *shader,
const float (*input)[4],
float (*output)[4],
const void *constants[PIPE_MAX_CONSTANT],
const void *constants[PIPE_MAX_CONSTANT_BUFFERS],
unsigned count,
unsigned input_stride,
unsigned output_stride);

10
src/gallium/auxiliary/draw/draw_private.h
View file

@ -153,8 +153,8 @@ struct draw_context
const void *vbuffer[PIPE_MAX_ATTRIBS];
/** constant buffer (for vertex/geometry shader) */
const void *vs_constants[PIPE_MAX_CONSTANT];
const void *gs_constants[PIPE_MAX_CONSTANT];
const void *vs_constants[PIPE_MAX_CONSTANT_BUFFERS];
const void *gs_constants[PIPE_MAX_CONSTANT_BUFFERS];
} user;
boolean test_fse; /* enable FSE even though its not correct (eg for softpipe) */
@ -202,10 +202,10 @@ struct draw_context
struct aos_machine *aos_machine;
const void *aligned_constants[PIPE_MAX_CONSTANT];
const void *aligned_constants[PIPE_MAX_CONSTANT_BUFFERS];
const void *aligned_constant_storage[PIPE_MAX_CONSTANT];
unsigned const_storage_size[PIPE_MAX_CONSTANT];
const void *aligned_constant_storage[PIPE_MAX_CONSTANT_BUFFERS];
unsigned const_storage_size[PIPE_MAX_CONSTANT_BUFFERS];
struct translate *fetch;

2
src/gallium/auxiliary/draw/draw_vs.c
View file

@ -196,7 +196,7 @@ draw_vs_destroy( struct draw_context *draw )
if (draw->vs.aos_machine)
draw_vs_aos_machine_destroy(draw->vs.aos_machine);
for (i = 0; i < PIPE_MAX_CONSTANT; i++) {
for (i = 0; i < PIPE_MAX_CONSTANT_BUFFERS; i++) {
if (draw->vs.aligned_constant_storage[i]) {
align_free((void *)draw->vs.aligned_constant_storage[i]);
}

2
src/gallium/auxiliary/draw/draw_vs.h
View file

@ -132,7 +132,7 @@ struct draw_vertex_shader {
void (*run_linear)( struct draw_vertex_shader *shader,
const float (*input)[4],
float (*output)[4],
const void *constants[PIPE_MAX_CONSTANT],
const void *constants[PIPE_MAX_CONSTANT_BUFFERS],
unsigned count,
unsigned input_stride,
unsigned output_stride );

4
src/gallium/auxiliary/draw/draw_vs_aos.c
View file

@ -2119,7 +2119,7 @@ static void PIPE_CDECL vaos_run_elts( struct draw_vs_varient *varient,
if (0) debug_printf("%s %d\n", __FUNCTION__, count);
machine->internal[IMM_PSIZE][0] = vaos->draw->rasterizer->point_size;
for (i = 0; i < PIPE_MAX_CONSTANT; i++) {
for (i = 0; i < PIPE_MAX_CONSTANT_BUFFERS; i++) {
machine->constants[i] = vaos->draw->vs.aligned_constants[i];
}
machine->immediates = vaos->base.vs->immediates;
@ -2144,7 +2144,7 @@ static void PIPE_CDECL vaos_run_linear( struct draw_vs_varient *varient,
vaos->base.key.const_vbuffers);
machine->internal[IMM_PSIZE][0] = vaos->draw->rasterizer->point_size;
for (i = 0; i < PIPE_MAX_CONSTANT; i++) {
for (i = 0; i < PIPE_MAX_CONSTANT_BUFFERS; i++) {
machine->constants[i] = vaos->draw->vs.aligned_constants[i];
}
machine->immediates = vaos->base.vs->immediates;

2
src/gallium/auxiliary/draw/draw_vs_aos.h
View file

@ -122,7 +122,7 @@ struct aos_machine {
ushort fpucntl; /* one of FPU_* above */
const float (*immediates)[4]; /* points to shader data */
const void *constants[PIPE_MAX_CONSTANT]; /* points to draw data */
const void *constants[PIPE_MAX_CONSTANT_BUFFERS]; /* points to draw data */
const struct aos_buffer *buffer; /* points to ? */
};

4
src/gallium/auxiliary/draw/draw_vs_exec.c
View file

@ -85,7 +85,7 @@ static void
vs_exec_run_linear( struct draw_vertex_shader *shader,
const float (*input)[4],
float (*output)[4],
const void *constants[PIPE_MAX_CONSTANT],
const void *constants[PIPE_MAX_CONSTANT_BUFFERS],
unsigned count,
unsigned input_stride,
unsigned output_stride )
@ -95,7 +95,7 @@ vs_exec_run_linear( struct draw_vertex_shader *shader,
unsigned int i, j;
unsigned slot;
for (i = 0; i < PIPE_MAX_CONSTANT; i++) {
for (i = 0; i < PIPE_MAX_CONSTANT_BUFFERS; i++) {
machine->Consts[i] = constants[i];
}

2
src/gallium/auxiliary/draw/draw_vs_llvm.c
View file

@ -64,7 +64,7 @@ static void
vs_llvm_run_linear( struct draw_vertex_shader *base,
const float (*input)[4],
float (*output)[4],
const void *constants[PIPE_MAX_CONSTANT],
const void *constants[PIPE_MAX_CONSTANT_BUFFERS],
unsigned count,
unsigned input_stride,
unsigned output_stride )

2
src/gallium/auxiliary/draw/draw_vs_ppc.c
View file

@ -85,7 +85,7 @@ static void
vs_ppc_run_linear( struct draw_vertex_shader *base,
const float (*input)[4],
float (*output)[4],
const void *constants[PIPE_MAX_CONSTANT],
const void *constants[PIPE_MAX_CONSTANT_BUFFERS],
unsigned count,
unsigned input_stride,
unsigned output_stride )

2
src/gallium/auxiliary/draw/draw_vs_sse.c
View file

@ -83,7 +83,7 @@ static void
vs_sse_run_linear( struct draw_vertex_shader *base,
const float (*input)[4],
float (*output)[4],
const void *constants[PIPE_MAX_CONSTANT],
const void *constants[PIPE_MAX_CONSTANT_BUFFERS],
unsigned count,
unsigned input_stride,
unsigned output_stride )

2
src/gallium/auxiliary/tgsi/tgsi_exec.c
View file

@ -965,7 +965,7 @@ fetch_src_file_channel(const struct tgsi_exec_machine *mach,
switch (file) {
case TGSI_FILE_CONSTANT:
for (i = 0; i < QUAD_SIZE; i++) {
assert(index2D->i[i] >= 0 && index2D->i[i] < PIPE_MAX_CONSTANT);
assert(index2D->i[i] >= 0 && index2D->i[i] < PIPE_MAX_CONSTANT_BUFFERS);
assert(mach->Consts[index2D->i[i]]);
if (index->i[i] < 0) {

2
src/gallium/auxiliary/tgsi/tgsi_exec.h
View file

@ -260,7 +260,7 @@ struct tgsi_exec_machine
struct tgsi_sampler **Samplers;
unsigned ImmLimit;
const void *Consts[PIPE_MAX_CONSTANT];
const void *Consts[PIPE_MAX_CONSTANT_BUFFERS];
const struct tgsi_token *Tokens; /**< Declarations, instructions */
unsigned Processor; /**< TGSI_PROCESSOR_x */

6
src/gallium/auxiliary/tgsi/tgsi_ureg.c
View file

@ -136,7 +136,7 @@ struct ureg_program
unsigned temps_active[UREG_MAX_TEMP / 32];
unsigned nr_temps;
struct const_decl const_decls[PIPE_MAX_CONSTANT];
struct const_decl const_decls[PIPE_MAX_CONSTANT_BUFFERS];
unsigned property_gs_input_prim;
@ -367,7 +367,7 @@ ureg_DECL_constant2D(struct ureg_program *ureg,
{
struct const_decl *decl = &ureg->const_decls[index2D];
assert(index2D < PIPE_MAX_CONSTANT);
assert(index2D < PIPE_MAX_CONSTANT_BUFFERS);
if (decl->nr_constant_ranges < UREG_MAX_CONSTANT_RANGE) {
uint i = decl->nr_constant_ranges++;
@ -1209,7 +1209,7 @@ static void emit_decls( struct ureg_program *ureg )
ureg->sampler[i].Index, 1 );
}
for (i = 0; i < PIPE_MAX_CONSTANT; i++) {
for (i = 0; i < PIPE_MAX_CONSTANT_BUFFERS; i++) {
struct const_decl *decl = &ureg->const_decls[i];
if (decl->nr_constant_ranges) {

2
src/gallium/drivers/softpipe/sp_context.c
View file

@ -114,7 +114,7 @@ softpipe_destroy( struct pipe_context *pipe )
for (i = 0; i < PIPE_SHADER_TYPES; i++) {
uint j;
for (j = 0; j < PIPE_MAX_CONSTANT; j++) {
for (j = 0; j < PIPE_MAX_CONSTANT_BUFFERS; j++) {
if (softpipe->constants[i][j]) {
pipe_buffer_reference(&softpipe->constants[i][j], NULL);
}

4
src/gallium/drivers/softpipe/sp_context.h
View file

@ -63,7 +63,7 @@ struct softpipe_context {
/** Other rendering state */
struct pipe_blend_color blend_color;
struct pipe_clip_state clip;
struct pipe_buffer *constants[PIPE_SHADER_TYPES][PIPE_MAX_CONSTANT];
struct pipe_buffer *constants[PIPE_SHADER_TYPES][PIPE_MAX_CONSTANT_BUFFERS];
struct pipe_framebuffer_state framebuffer;
struct pipe_poly_stipple poly_stipple;
struct pipe_scissor_state scissor;
@ -92,7 +92,7 @@ struct softpipe_context {
ubyte *mapped_vbuffer[PIPE_MAX_ATTRIBS];
/** Mapped constant buffers */
void *mapped_constants[PIPE_SHADER_TYPES][PIPE_MAX_CONSTANT];
void *mapped_constants[PIPE_SHADER_TYPES][PIPE_MAX_CONSTANT_BUFFERS];
/** Vertex format */
struct vertex_info vertex_info;

8
src/gallium/drivers/softpipe/sp_draw_arrays.c
View file

@ -54,7 +54,7 @@ softpipe_map_constant_buffers(struct softpipe_context *sp)
for (i = 0; i < PIPE_SHADER_TYPES; i++) {
uint j;
for (j = 0; j < PIPE_MAX_CONSTANT; j++) {
for (j = 0; j < PIPE_MAX_CONSTANT_BUFFERS; j++) {
if (sp->constants[i][j] && sp->constants[i][j]->size) {
sp->mapped_constants[i][j] = ws->buffer_map(ws,
sp->constants[i][j],
@ -63,7 +63,7 @@ softpipe_map_constant_buffers(struct softpipe_context *sp)
}
}
for (i = 0; i < PIPE_MAX_CONSTANT; i++) {
for (i = 0; i < PIPE_MAX_CONSTANT_BUFFERS; i++) {
if (sp->constants[PIPE_SHADER_VERTEX][i]) {
draw_set_mapped_constant_buffer(sp->draw,
PIPE_SHADER_VERTEX,
@ -93,7 +93,7 @@ softpipe_unmap_constant_buffers(struct softpipe_context *sp)
*/
draw_flush(sp->draw);
for (i = 0; i < PIPE_MAX_CONSTANT; i++) {
for (i = 0; i < PIPE_MAX_CONSTANT_BUFFERS; i++) {
draw_set_mapped_constant_buffer(sp->draw,
PIPE_SHADER_VERTEX,
i,
@ -109,7 +109,7 @@ softpipe_unmap_constant_buffers(struct softpipe_context *sp)
for (i = 0; i < PIPE_SHADER_TYPES; i++) {
uint j;
for (j = 0; j < PIPE_MAX_CONSTANT; j++) {
for (j = 0; j < PIPE_MAX_CONSTANT_BUFFERS; j++) {
if (sp->constants[i][j] && sp->constants[i][j]->size) {
ws->buffer_unmap(ws, sp->constants[i][j]);
}

2
src/gallium/drivers/softpipe/sp_quad_fs.c
View file

@ -109,7 +109,7 @@ shade_quads(struct quad_stage *qs,
struct tgsi_exec_machine *machine = qss->machine;
unsigned i, pass = 0;
for (i = 0; i < PIPE_MAX_CONSTANT; i++) {
for (i = 0; i < PIPE_MAX_CONSTANT_BUFFERS; i++) {
machine->Consts[i] = softpipe->mapped_constants[PIPE_SHADER_FRAGMENT][i];
}
machine->InterpCoefs = quads[0]->coef;

2
src/gallium/drivers/softpipe/sp_state_fs.c
View file

@ -164,7 +164,7 @@ softpipe_set_constant_buffer(struct pipe_context *pipe,
struct softpipe_context *softpipe = softpipe_context(pipe);
assert(shader < PIPE_SHADER_TYPES);
assert(index < PIPE_MAX_CONSTANT);
assert(index < PIPE_MAX_CONSTANT_BUFFERS);
draw_flush(softpipe->draw);

2
src/gallium/include/pipe/p_state.h
View file

@ -58,7 +58,7 @@ extern "C" {
#define PIPE_MAX_ATTRIBS 32
#define PIPE_MAX_CLIP_PLANES 6
#define PIPE_MAX_COLOR_BUFS 8
#define PIPE_MAX_CONSTANT 32
#define PIPE_MAX_CONSTANT_BUFFERS 32
#define PIPE_MAX_SAMPLERS 16
#define PIPE_MAX_VERTEX_SAMPLERS 16
#define PIPE_MAX_SHADER_INPUTS 16