KonstantinSeurer
/
mesa
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

llvmpipe: Eliminate constant mapping/unmapping.

This commit is contained in:
José Fonseca 2009-10-09 11:29:33 +01:00
parent d54e9f54d0
commit 69588d7ed5
3 changed files with 17 additions and 56 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/gallium/drivers/llvmpipe/lp_context.h
View File

@ -88,9 +88,6 @@ struct llvmpipe_context {
/** Mapped vertex buffers */
ubyte *mapped_vbuffer[PIPE_MAX_ATTRIBS];
/** Mapped constant buffers */
void *mapped_constants[PIPE_SHADER_TYPES];
/** Vertex format */
struct vertex_info vertex_info;
struct vertex_info vertex_info_vbuf;

50
src/gallium/drivers/llvmpipe/lp_draw_arrays.c
View File

@ -45,54 +45,6 @@
static void
llvmpipe_map_constant_buffers(struct llvmpipe_context *lp)
{
struct pipe_screen *screen = lp->pipe.screen;
uint i, size;
for (i = 0; i < PIPE_SHADER_TYPES; i++) {
if (lp->constants[i].buffer && lp->constants[i].buffer->size)
lp->mapped_constants[i] = screen->buffer_map(screen, lp->constants[i].buffer,
PIPE_BUFFER_USAGE_CPU_READ);
}
if (lp->constants[PIPE_SHADER_VERTEX].buffer)
size = lp->constants[PIPE_SHADER_VERTEX].buffer->size;
else
size = 0;
lp->jit_context.constants = lp->mapped_constants[PIPE_SHADER_FRAGMENT];
draw_set_mapped_constant_buffer(lp->draw,
lp->mapped_constants[PIPE_SHADER_VERTEX],
size);
}
static void
llvmpipe_unmap_constant_buffers(struct llvmpipe_context *lp)
{
struct pipe_screen *screen = lp->pipe.screen;
uint i;
/* really need to flush all prims since the vert/frag shaders const buffers
* are going away now.
*/
draw_flush(lp->draw);
draw_set_mapped_constant_buffer(lp->draw, NULL, 0);
lp->jit_context.constants = NULL;
for (i = 0; i < 2; i++) {
if (lp->constants[i].buffer && lp->constants[i].buffer->size)
screen->buffer_unmap(screen, lp->constants[i].buffer);
lp->mapped_constants[i] = NULL;
}
}
boolean
llvmpipe_draw_arrays(struct pipe_context *pipe, unsigned mode,
unsigned start, unsigned count)
@ -124,7 +76,6 @@ llvmpipe_draw_range_elements(struct pipe_context *pipe,
llvmpipe_update_derived( lp );
llvmpipe_map_transfers(lp);
llvmpipe_map_constant_buffers(lp);
/*
* Map vertex buffers
@ -163,7 +114,6 @@ llvmpipe_draw_range_elements(struct pipe_context *pipe,
/* Note: leave drawing surfaces mapped */
llvmpipe_unmap_constant_buffers(lp);
lp->dirty_render_cache = TRUE;

20
src/gallium/drivers/llvmpipe/lp_state_fs.c
View File

@ -83,6 +83,7 @@
#include "lp_bld_debug.h"
#include "lp_screen.h"
#include "lp_context.h"
#include "lp_buffer.h"
#include "lp_state.h"
#include "lp_quad.h"
#include "lp_tex_sample.h"
@ -671,16 +672,29 @@ llvmpipe_delete_fs_state(struct pipe_context *pipe, void *fs)
void
llvmpipe_set_constant_buffer(struct pipe_context *pipe,
uint shader, uint index,
const struct pipe_constant_buffer *buf)
const struct pipe_constant_buffer *constants)
{
struct llvmpipe_context *llvmpipe = llvmpipe_context(pipe);
struct pipe_buffer *buffer = constants ? constants->buffer : NULL;
unsigned size = buffer ? buffer->size : 0;
const void *data = buffer ? llvmpipe_buffer(buffer)->data : NULL;
assert(shader < PIPE_SHADER_TYPES);
assert(index == 0);
if(shader == PIPE_SHADER_VERTEX)
draw_flush(llvmpipe->draw);
/* note: reference counting */
pipe_buffer_reference(&llvmpipe->constants[shader].buffer,
buf ? buf->buffer : NULL);
pipe_buffer_reference(&llvmpipe->constants[shader].buffer, buffer);
if(shader == PIPE_SHADER_FRAGMENT) {
llvmpipe->jit_context.constants = data;
}
if(shader == PIPE_SHADER_VERTEX) {
draw_set_mapped_constant_buffer(llvmpipe->draw, data, size);
}
llvmpipe->dirty |= LP_NEW_CONSTANTS;
}