X-Git-Url: https://git.libre-soc.org/?a=blobdiff_plain;f=src%2Fgallium%2Fdrivers%2Fi915%2Fi915_state.c;h=d8a5edfebf40b23810358ce01c2d3326655dce47;hb=8c9b9aac7d09e65195dca6681d59c10e4ef713d9;hp=ae4ad04826bc8391297844aac0f8e020e4d4f633;hpb=8c6594074e798e8d5e13dc49720f7b8b4b381bbb;p=mesa.git diff --git a/src/gallium/drivers/i915/i915_state.c b/src/gallium/drivers/i915/i915_state.c index ae4ad04826b..d8a5edfebf4 100644 --- a/src/gallium/drivers/i915/i915_state.c +++ b/src/gallium/drivers/i915/i915_state.c @@ -1,6 +1,6 @@ /************************************************************************** * - * Copyright 2007 Tungsten Graphics, Inc., Cedar Park, Texas. + * Copyright 2007 VMware, Inc. * All Rights Reserved. * * Permission is hereby granted, free of charge, to any person obtaining a @@ -18,14 +18,14 @@ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT. - * IN NO EVENT SHALL TUNGSTEN GRAPHICS AND/OR ITS SUPPLIERS BE LIABLE FOR + * IN NO EVENT SHALL VMWARE AND/OR ITS SUPPLIERS BE LIABLE FOR * ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, * TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. * **************************************************************************/ -/* Authors: Keith Whitwell +/* Authors: Keith Whitwell */ @@ -42,6 +42,7 @@ #include "i915_state_inlines.h" #include "i915_fpc.h" #include "i915_resource.h" +#include "i915_state.h" /* The i915 (and related graphics cores) do not support GL_CLAMP. The * Intel drivers for "other operating systems" implement GL_CLAMP as @@ -112,7 +113,7 @@ i915_create_blend_state(struct pipe_context *pipe, unsigned dstA = blend->rt[0].alpha_dst_factor; /* Special handling for MIN/MAX filter modes handled at - * state_tracker level. + * frontend level. */ if (srcA != srcRGB || @@ -300,7 +301,7 @@ i915_bind_vertex_sampler_states(struct pipe_context *pipe, struct i915_context *i915 = i915_context(pipe); unsigned i; - assert(num <= Elements(i915->vertex_samplers)); + assert(start + num <= ARRAY_SIZE(i915->vertex_samplers)); /* Check for no-op */ if (num == i915->num_vertex_samplers && @@ -337,17 +338,17 @@ static void i915_bind_fragment_sampler_states(struct pipe_context *pipe, /* Check for no-op */ if (num == i915->num_samplers && - !memcmp(i915->sampler + start, samplers, + !memcmp(i915->fragment_sampler + start, samplers, num * sizeof(void *))) return; for (i = 0; i < num; ++i) - i915->sampler[i + start] = samplers[i]; + i915->fragment_sampler[i + start] = samplers[i]; /* find highest non-null samplers[] entry */ { unsigned j = MAX2(i915->num_samplers, start + num); - while (j > 0 && i915->sampler[j - 1] == NULL) + while (j > 0 && i915->fragment_sampler[j - 1] == NULL) j--; i915->num_samplers = j; } @@ -357,7 +358,8 @@ static void i915_bind_fragment_sampler_states(struct pipe_context *pipe, static void -i915_bind_sampler_states(struct pipe_context *pipe, unsigned shader, +i915_bind_sampler_states(struct pipe_context *pipe, + enum pipe_shader_type shader, unsigned start, unsigned num_samplers, void **samplers) { @@ -422,7 +424,7 @@ i915_prepare_vertex_sampling(struct i915_context *i915) for (j = view->u.tex.first_level; j <= tex->last_level; j++) { mip_offsets[j] = i915_texture_offset(i915_tex, j , 0 /* FIXME depth */); row_stride[j] = i915_tex->stride; - img_stride[j] = 0; /* FIXME */; + img_stride[j] = 0; /* FIXME */ } draw_set_mapped_texture(i915->draw, @@ -430,7 +432,7 @@ i915_prepare_vertex_sampling(struct i915_context *i915) i, tex->width0, tex->height0, tex->depth0, view->u.tex.first_level, tex->last_level, - addr, + 0, 0, addr, row_stride, img_stride, mip_offsets); } else i915->mapped_vs_tex[i] = NULL; @@ -442,7 +444,7 @@ i915_cleanup_vertex_sampling(struct i915_context *i915) { struct i915_winsys *iws = i915->iws; unsigned i; - for (i = 0; i < Elements(i915->mapped_vs_tex); i++) { + for (i = 0; i < ARRAY_SIZE(i915->mapped_vs_tex); i++) { if (i915->mapped_vs_tex_buffer[i]) { iws->buffer_unmap(iws, i915->mapped_vs_tex_buffer[i]); pipe_resource_reference(&i915->mapped_vs_tex[i], NULL); @@ -627,12 +629,10 @@ void i915_delete_fs_state(struct pipe_context *pipe, void *shader) FREE(ifs->decl); ifs->decl = NULL; - if (ifs->program) { - FREE(ifs->program); - ifs->program = NULL; - FREE((struct tgsi_token *)ifs->state.tokens); - ifs->state.tokens = NULL; - } + FREE(ifs->program); + ifs->program = NULL; + FREE((struct tgsi_token *)ifs->state.tokens); + ifs->state.tokens = NULL; ifs->program_len = 0; ifs->decl_len = 0; @@ -675,8 +675,8 @@ static void i915_delete_vs_state(struct pipe_context *pipe, void *shader) } static void i915_set_constant_buffer(struct pipe_context *pipe, - uint shader, uint index, - struct pipe_constant_buffer *cb) + enum pipe_shader_type shader, uint index, + const struct pipe_constant_buffer *cb) { struct i915_context *i915 = i915_context(pipe); struct pipe_resource *buf = cb ? cb->buffer : NULL; @@ -745,17 +745,11 @@ static void i915_set_fragment_sampler_views(struct pipe_context *pipe, return; for (i = 0; i < num; i++) { - /* Note: we're using pipe_sampler_view_release() here to work around - * a possible crash when the old view belongs to another context that - * was already destroyed. - */ - pipe_sampler_view_release(pipe, &i915->fragment_sampler_views[i]); - pipe_sampler_view_reference(&i915->fragment_sampler_views[i], - views[i]); + pipe_sampler_view_reference(&i915->fragment_sampler_views[i], views[i]); } for (i = num; i < i915->num_fragment_sampler_views; i++) - pipe_sampler_view_release(pipe, &i915->fragment_sampler_views[i]); + pipe_sampler_view_reference(&i915->fragment_sampler_views[i], NULL); i915->num_fragment_sampler_views = num; @@ -770,7 +764,7 @@ i915_set_vertex_sampler_views(struct pipe_context *pipe, struct i915_context *i915 = i915_context(pipe); uint i; - assert(num <= Elements(i915->vertex_sampler_views)); + assert(num <= ARRAY_SIZE(i915->vertex_sampler_views)); /* Check for no-op */ if (num == i915->num_vertex_sampler_views && @@ -778,7 +772,7 @@ i915_set_vertex_sampler_views(struct pipe_context *pipe, return; } - for (i = 0; i < Elements(i915->vertex_sampler_views); i++) { + for (i = 0; i < ARRAY_SIZE(i915->vertex_sampler_views); i++) { struct pipe_sampler_view *view = i < num ? views[i] : NULL; pipe_sampler_view_reference(&i915->vertex_sampler_views[i], view); @@ -793,6 +787,45 @@ i915_set_vertex_sampler_views(struct pipe_context *pipe, } +static void +i915_set_sampler_views(struct pipe_context *pipe, enum pipe_shader_type shader, + unsigned start, unsigned num, + struct pipe_sampler_view **views) +{ + assert(start == 0); + switch (shader) { + case PIPE_SHADER_FRAGMENT: + i915_set_fragment_sampler_views(pipe, num, views); + break; + case PIPE_SHADER_VERTEX: + i915_set_vertex_sampler_views(pipe, num, views); + break; + default: + ; + } +} + + +struct pipe_sampler_view * +i915_create_sampler_view_custom(struct pipe_context *pipe, + struct pipe_resource *texture, + const struct pipe_sampler_view *templ, + unsigned width0, + unsigned height0) +{ + struct pipe_sampler_view *view = CALLOC_STRUCT(pipe_sampler_view); + + if (view) { + *view = *templ; + view->reference.count = 1; + view->texture = NULL; + pipe_resource_reference(&view->texture, texture); + view->context = pipe; + } + + return view; +} + static struct pipe_sampler_view * i915_create_sampler_view(struct pipe_context *pipe, struct pipe_resource *texture, @@ -855,7 +888,7 @@ static void i915_set_clip_state( struct pipe_context *pipe, -/* Called when driver state tracker notices changes to the viewport +/* Called when gallium frontends notice changes to the viewport * matrix: */ static void i915_set_viewport_states( struct pipe_context *pipe, @@ -882,7 +915,6 @@ i915_create_rasterizer_state(struct pipe_context *pipe, struct i915_rasterizer_state *cso = CALLOC_STRUCT( i915_rasterizer_state ); cso->templ = *rasterizer; - cso->color_interp = rasterizer->flatshade ? INTERP_CONSTANT : INTERP_LINEAR; cso->light_twoside = rasterizer->light_twoside; cso->ds[0].u = _3DSTATE_DEPTH_OFFSET_SCALE; cso->ds[1].f = rasterizer->offset_scale; @@ -1022,17 +1054,6 @@ i915_delete_vertex_elements_state(struct pipe_context *pipe, void *velems) FREE( velems ); } -static void i915_set_index_buffer(struct pipe_context *pipe, - const struct pipe_index_buffer *ib) -{ - struct i915_context *i915 = i915_context(pipe); - - if (ib) - memcpy(&i915->index_buffer, ib, sizeof(i915->index_buffer)); - else - memset(&i915->index_buffer, 0, sizeof(i915->index_buffer)); -} - static void i915_set_sample_mask(struct pipe_context *pipe, unsigned sample_mask) @@ -1076,11 +1097,9 @@ i915_init_state_functions( struct i915_context *i915 ) i915->base.set_polygon_stipple = i915_set_polygon_stipple; i915->base.set_scissor_states = i915_set_scissor_states; - i915->base.set_fragment_sampler_views = i915_set_fragment_sampler_views; - i915->base.set_vertex_sampler_views = i915_set_vertex_sampler_views; + i915->base.set_sampler_views = i915_set_sampler_views; i915->base.create_sampler_view = i915_create_sampler_view; i915->base.sampler_view_destroy = i915_sampler_view_destroy; i915->base.set_viewport_states = i915_set_viewport_states; i915->base.set_vertex_buffers = i915_set_vertex_buffers; - i915->base.set_index_buffer = i915_set_index_buffer; }