r300g: Remove r300_constant_buffer::user_count.

Not needed with new compiler.
This commit is contained in:
Corbin Simpson 2009-08-07 19:46:52 -07:00
parent a962c07cc3
commit c58133b81a
3 changed files with 3 additions and 6 deletions

View file

@ -52,7 +52,7 @@ static boolean r300_draw_range_elements(struct pipe_context* pipe,
draw_set_mapped_constant_buffer(r300->draw,
r300->shader_constants[PIPE_SHADER_VERTEX].constants,
r300->shader_constants[PIPE_SHADER_VERTEX].user_count *
r300->shader_constants[PIPE_SHADER_VERTEX].count *
(sizeof(float) * 4));
draw_arrays(r300->draw, mode, start, count);

View file

@ -146,8 +146,6 @@ struct r300_constant_buffer {
/* Buffer of constants */
/* XXX first number should be raised */
float constants[32][4];
/* Number of user-defined constants */
unsigned user_count;
/* Total number of constants */
unsigned count;
};

View file

@ -138,7 +138,6 @@ static void
const struct pipe_constant_buffer* buffer)
{
struct r300_context* r300 = r300_context(pipe);
int i = r300->shader_constants[shader].user_count;
/* This entire chunk of code seems ever-so-slightly baked.
* It's as if I've got pipe_buffer* matryoshkas... */
@ -149,10 +148,10 @@ static void
map, buffer->buffer->size);
pipe->winsys->buffer_unmap(pipe->winsys, buffer->buffer);
r300->shader_constants[shader].user_count =
r300->shader_constants[shader].count =
buffer->buffer->size / (sizeof(float) * 4);
} else {
r300->shader_constants[shader].user_count = 0;
r300->shader_constants[shader].count = 0;
}
r300->dirty_state |= R300_NEW_CONSTANTS;