static void
llvmpipe_bind_sampler_states(struct pipe_context *pipe,
- unsigned num, void **sampler)
+ unsigned shader,
+ unsigned start,
+ unsigned num,
+ void **samplers)
{
struct llvmpipe_context *llvmpipe = llvmpipe_context(pipe);
unsigned i;
- assert(num <= PIPE_MAX_SAMPLERS);
+ assert(shader < PIPE_SHADER_TYPES);
+ assert(start + num <= Elements(llvmpipe->samplers[shader]));
/* Check for no-op */
- if (num == llvmpipe->num_samplers &&
- !memcmp(llvmpipe->sampler, sampler, num * sizeof(void *)))
+ if (start + num <= llvmpipe->num_samplers[shader] &&
+ !memcmp(llvmpipe->samplers[shader] + start, samplers,
+ num * sizeof(void *))) {
return;
+ }
draw_flush(llvmpipe->draw);
- for (i = 0; i < num; ++i)
- llvmpipe->sampler[i] = sampler[i];
- for (i = num; i < PIPE_MAX_SAMPLERS; ++i)
- llvmpipe->sampler[i] = NULL;
+ /* set the new samplers */
+ for (i = 0; i < num; i++) {
+ llvmpipe->samplers[shader][start + i] = samplers[i];
+ }
+
+ /* find highest non-null samplers[] entry */
+ {
+ unsigned j = MAX2(llvmpipe->num_samplers[shader], start + num);
+ while (j > 0 && llvmpipe->samplers[shader][j - 1] == NULL)
+ j--;
+ llvmpipe->num_samplers[shader] = j;
+ }
- llvmpipe->num_samplers = num;
+ if (shader == PIPE_SHADER_VERTEX || shader == PIPE_SHADER_GEOMETRY) {
+ draw_set_samplers(llvmpipe->draw,
+ shader,
+ llvmpipe->samplers[shader],
+ llvmpipe->num_samplers[shader]);
+ }
llvmpipe->dirty |= LP_NEW_SAMPLER;
}
static void
-llvmpipe_bind_vertex_sampler_states(struct pipe_context *pipe,
- unsigned num_samplers,
- void **samplers)
+llvmpipe_bind_fragment_sampler_states(struct pipe_context *pipe,
+ unsigned num, void **samplers)
{
- struct llvmpipe_context *llvmpipe = llvmpipe_context(pipe);
- unsigned i;
-
- assert(num_samplers <= PIPE_MAX_VERTEX_SAMPLERS);
-
- /* Check for no-op */
- if (num_samplers == llvmpipe->num_vertex_samplers &&
- !memcmp(llvmpipe->vertex_samplers, samplers, num_samplers * sizeof(void *)))
- return;
-
- draw_flush(llvmpipe->draw);
-
- for (i = 0; i < num_samplers; ++i)
- llvmpipe->vertex_samplers[i] = samplers[i];
- for (i = num_samplers; i < PIPE_MAX_VERTEX_SAMPLERS; ++i)
- llvmpipe->vertex_samplers[i] = NULL;
-
- llvmpipe->num_vertex_samplers = num_samplers;
+ llvmpipe_bind_sampler_states(pipe, PIPE_SHADER_FRAGMENT, 0, num, samplers);
+}
- draw_set_samplers(llvmpipe->draw,
- llvmpipe->vertex_samplers,
- llvmpipe->num_vertex_samplers);
- llvmpipe->dirty |= LP_NEW_SAMPLER;
+static void
+llvmpipe_bind_vertex_sampler_states(struct pipe_context *pipe,
+ unsigned num, void **samplers)
+{
+ llvmpipe_bind_sampler_states(pipe, PIPE_SHADER_VERTEX, 0, num, samplers);
}
static void
llvmpipe_bind_geometry_sampler_states(struct pipe_context *pipe,
- unsigned num, void **sampler)
+ unsigned num, void **samplers)
{
- /* XXX: implementation missing */
+ llvmpipe_bind_sampler_states(pipe, PIPE_SHADER_GEOMETRY, 0, num, samplers);
}
static void
-llvmpipe_set_fragment_sampler_views(struct pipe_context *pipe,
- unsigned num,
- struct pipe_sampler_view **views)
+llvmpipe_set_sampler_views(struct pipe_context *pipe,
+ unsigned shader,
+ unsigned start,
+ unsigned num,
+ struct pipe_sampler_view **views)
{
struct llvmpipe_context *llvmpipe = llvmpipe_context(pipe);
uint i;
- assert(num <= PIPE_MAX_SAMPLERS);
+ assert(num <= PIPE_MAX_SHADER_SAMPLER_VIEWS);
+
+ assert(shader < PIPE_SHADER_TYPES);
+ assert(start + num <= Elements(llvmpipe->sampler_views[shader]));
/* Check for no-op */
- if (num == llvmpipe->num_fragment_sampler_views &&
- !memcmp(llvmpipe->fragment_sampler_views, views, num * sizeof(struct pipe_sampler_view *)))
+ if (start + num <= llvmpipe->num_sampler_views[shader] &&
+ !memcmp(llvmpipe->sampler_views[shader] + start, views,
+ num * sizeof(struct pipe_sampler_view *))) {
return;
+ }
draw_flush(llvmpipe->draw);
- for (i = 0; i < PIPE_MAX_SAMPLERS; i++) {
- struct pipe_sampler_view *view = i < num ? views[i] : NULL;
+ /* set the new sampler views */
+ for (i = 0; i < num; i++) {
+ pipe_sampler_view_reference(&llvmpipe->sampler_views[shader][start + i],
+ views[i]);
+ }
- pipe_sampler_view_reference(&llvmpipe->fragment_sampler_views[i], view);
+ /* find highest non-null sampler_views[] entry */
+ {
+ unsigned j = MAX2(llvmpipe->num_sampler_views[shader], start + num);
+ while (j > 0 && llvmpipe->sampler_views[shader][j - 1] == NULL)
+ j--;
+ llvmpipe->num_sampler_views[shader] = j;
}
- llvmpipe->num_fragment_sampler_views = num;
+ if (shader == PIPE_SHADER_VERTEX || shader == PIPE_SHADER_GEOMETRY) {
+ draw_set_sampler_views(llvmpipe->draw,
+ shader,
+ llvmpipe->sampler_views[shader],
+ llvmpipe->num_sampler_views[shader]);
+ }
llvmpipe->dirty |= LP_NEW_SAMPLER_VIEW;
}
+static void
+llvmpipe_set_fragment_sampler_views(struct pipe_context *pipe,
+ unsigned num,
+ struct pipe_sampler_view **views)
+{
+ llvmpipe_set_sampler_views(pipe, PIPE_SHADER_FRAGMENT, 0, num, views);
+}
+
+
static void
llvmpipe_set_vertex_sampler_views(struct pipe_context *pipe,
unsigned num,
struct pipe_sampler_view **views)
{
- struct llvmpipe_context *llvmpipe = llvmpipe_context(pipe);
- uint i;
-
- assert(num <= PIPE_MAX_VERTEX_SAMPLERS);
-
- /* Check for no-op */
- if (num == llvmpipe->num_vertex_sampler_views &&
- !memcmp(llvmpipe->vertex_sampler_views, views, num * sizeof(struct pipe_sampler_view *))) {
- return;
- }
-
- draw_flush(llvmpipe->draw);
-
- for (i = 0; i < PIPE_MAX_VERTEX_SAMPLERS; i++) {
- struct pipe_sampler_view *view = i < num ? views[i] : NULL;
-
- pipe_sampler_view_reference(&llvmpipe->vertex_sampler_views[i], view);
- }
-
- llvmpipe->num_vertex_sampler_views = num;
-
- draw_set_sampler_views(llvmpipe->draw,
- llvmpipe->vertex_sampler_views,
- llvmpipe->num_vertex_sampler_views);
-
- llvmpipe->dirty |= LP_NEW_SAMPLER_VIEW;
+ llvmpipe_set_sampler_views(pipe, PIPE_SHADER_VERTEX, 0, num, views);
}
unsigned num,
struct pipe_sampler_view **views)
{
- /*XXX: implementation missing */
+ llvmpipe_set_sampler_views(pipe, PIPE_SHADER_GEOMETRY, 0, num, views);
}
static struct pipe_sampler_view *
struct pipe_sampler_view **views)
{
unsigned i;
- uint32_t row_stride[DRAW_MAX_TEXTURE_LEVELS];
- uint32_t img_stride[DRAW_MAX_TEXTURE_LEVELS];
- const void *data[DRAW_MAX_TEXTURE_LEVELS];
+ uint32_t row_stride[PIPE_MAX_TEXTURE_LEVELS];
+ uint32_t img_stride[PIPE_MAX_TEXTURE_LEVELS];
+ uint32_t mip_offsets[PIPE_MAX_TEXTURE_LEVELS];
+ const void *addr;
- assert(num <= PIPE_MAX_VERTEX_SAMPLERS);
+ assert(num <= PIPE_MAX_SHADER_SAMPLER_VIEWS);
if (!num)
return;
- for (i = 0; i < PIPE_MAX_VERTEX_SAMPLERS; i++) {
+ for (i = 0; i < PIPE_MAX_SHADER_SAMPLER_VIEWS; i++) {
struct pipe_sampler_view *view = i < num ? views[i] : NULL;
if (view) {
struct pipe_resource *tex = view->texture;
struct llvmpipe_resource *lp_tex = llvmpipe_resource(tex);
+ unsigned num_layers;
+
+ if (tex->target == PIPE_TEXTURE_3D) {
+ num_layers = tex->depth0;
+ }
+ else {
+ num_layers = tex->array_size;
+ }
/* We're referencing the texture's internal data, so save a
* reference to it.
if (!lp_tex->dt) {
/* regular texture - setup array of mipmap level pointers */
+ /* XXX this may fail due to OOM ? */
int j;
- for (j = 0; j <= tex->last_level; j++) {
- data[j] =
- llvmpipe_get_texture_image_all(lp_tex, j, LP_TEX_USAGE_READ,
- LP_TEX_LAYOUT_LINEAR);
+ void *mip_ptr;
+ /* must trigger allocation first before we can get base ptr */
+ mip_ptr = llvmpipe_get_texture_image_all(lp_tex, view->u.tex.first_level,
+ LP_TEX_USAGE_READ,
+ LP_TEX_LAYOUT_LINEAR);
+ addr = lp_tex->linear_img.data;
+ for (j = view->u.tex.first_level; j <= tex->last_level; j++) {
+ mip_ptr = llvmpipe_get_texture_image_all(lp_tex, j,
+ LP_TEX_USAGE_READ,
+ LP_TEX_LAYOUT_LINEAR);
+ mip_offsets[j] = (uint8_t *)mip_ptr - (uint8_t *)addr;
+ /*
+ * could get mip offset directly but need call above to
+ * invoke tiled->linear conversion.
+ */
+ assert(lp_tex->linear_mip_offsets[j] == mip_offsets[j]);
row_stride[j] = lp_tex->row_stride[j];
img_stride[j] = lp_tex->img_stride[j];
}
*/
struct llvmpipe_screen *screen = llvmpipe_screen(tex->screen);
struct sw_winsys *winsys = screen->winsys;
- data[0] = winsys->displaytarget_map(winsys, lp_tex->dt,
+ addr = winsys->displaytarget_map(winsys, lp_tex->dt,
PIPE_TRANSFER_READ);
row_stride[0] = lp_tex->row_stride[0];
img_stride[0] = lp_tex->img_stride[0];
- assert(data[0]);
+ mip_offsets[0] = 0;
+ assert(addr);
}
draw_set_mapped_texture(lp->draw,
+ PIPE_SHADER_VERTEX,
i,
- tex->width0, tex->height0, tex->depth0,
- tex->last_level,
- row_stride, img_stride, data);
+ tex->width0, tex->height0, num_layers,
+ view->u.tex.first_level, tex->last_level,
+ addr,
+ row_stride, img_stride, mip_offsets);
}
}
}
{
llvmpipe->pipe.create_sampler_state = llvmpipe_create_sampler_state;
- llvmpipe->pipe.bind_fragment_sampler_states = llvmpipe_bind_sampler_states;
+ llvmpipe->pipe.bind_fragment_sampler_states = llvmpipe_bind_fragment_sampler_states;
llvmpipe->pipe.bind_vertex_sampler_states = llvmpipe_bind_vertex_sampler_states;
llvmpipe->pipe.bind_geometry_sampler_states = llvmpipe_bind_geometry_sampler_states;
llvmpipe->pipe.set_fragment_sampler_views = llvmpipe_set_fragment_sampler_views;
projects / mesa.git / blobdiff