[Mesa-dev] [PATCH 2/3] gallium: use unnormalized coords internally for NPOT textures
Marek Olšák
maraeo at gmail.com
Wed Aug 11 06:03:22 PDT 2010
The u_blitter part is OK with me.
-Marek
On Wed, Aug 11, 2010 at 1:44 PM, Luca Barbieri <luca at luca-barbieri.com>wrote:
> Currently Gallium internals always use normalized coordinates to
> access textures.
>
> However, for NPOT textures on hardware without ARB_texture_non_power_of_two
> support (e.g. nv30) this can trigger a software fallback or even not be
> supported at all.
>
> Hence, this change adds support for both kinds of normalization.
> ---
> src/gallium/auxiliary/util/u_blit.c | 38 +++++++++++++++++++------
> src/gallium/auxiliary/util/u_blitter.c | 48
> ++++++++++++++++++++-----------
> 2 files changed, 60 insertions(+), 26 deletions(-)
>
> diff --git a/src/gallium/auxiliary/util/u_blit.c
> b/src/gallium/auxiliary/util/u_blit.c
> index 97fa99e..315006c 100644
> --- a/src/gallium/auxiliary/util/u_blit.c
> +++ b/src/gallium/auxiliary/util/u_blit.c
> @@ -296,6 +296,7 @@ util_blit_pixels_writemask(struct blit_state *ctx,
> unsigned offset;
> boolean overlap;
> float s0, t0, s1, t1;
> + boolean normalized;
>
> assert(filter == PIPE_TEX_MIPFILTER_NEAREST ||
> filter == PIPE_TEX_MIPFILTER_LINEAR);
> @@ -335,7 +336,6 @@ util_blit_pixels_writemask(struct blit_state *ctx,
> return;
> }
>
> -
> /* Create a temporary texture when src and dest alias or when src
> * is anything other than a 2d texture.
> * XXX should just use appropriate shader to access 1d / 3d slice / cube
> face,
> @@ -379,6 +379,8 @@ util_blit_pixels_writemask(struct blit_state *ctx,
> texTemp.height0 = srcH;
> texTemp.depth0 = 1;
> texTemp.bind = PIPE_BIND_SAMPLER_VIEW;
> + if(!util_is_pot(srcW) || !util_is_pot(srcH))
> + texTemp.flags |= PIPE_RESOURCE_FLAG_UNNORMALIZED_COORDS_HINT;
>
> tex = screen->resource_create(screen, &texTemp);
> if (!tex)
> @@ -392,10 +394,19 @@ util_blit_pixels_writemask(struct blit_state *ctx,
> src_tex, srcsub, srcLeft, srcTop, srcZ0,
> /* src */
> srcW, srcH); /* size */
>
> - s0 = 0.0f;
> - s1 = 1.0f;
> - t0 = 0.0f;
> - t1 = 1.0f;
> + normalized = !(tex->flags &
> PIPE_RESOURCE_FLAG_UNNORMALIZED_COORDS_HINT);
> + if(normalized) {
> + s0 = 0.0f;
> + s1 = 1.0f;
> + t0 = 0.0f;
> + t1 = 1.0f;
> + }
> + else {
> + s0 = 0;
> + s1 = srcW;
> + t0 = 0;
> + t1 = srcH;
> + }
>
> u_sampler_view_default_template(&sv_templ, tex, tex->format);
> sampler_view = pipe->create_sampler_view(pipe, tex, &sv_templ);
> @@ -415,10 +426,18 @@ util_blit_pixels_writemask(struct blit_state *ctx,
> return;
> }
>
> - s0 = srcX0 / (float)(u_minify(sampler_view->texture->width0,
> srcsub.level));
> - s1 = srcX1 / (float)(u_minify(sampler_view->texture->width0,
> srcsub.level));
> - t0 = srcY0 / (float)(u_minify(sampler_view->texture->height0,
> srcsub.level));
> - t1 = srcY1 / (float)(u_minify(sampler_view->texture->height0,
> srcsub.level));
> + s0 = srcX0;
> + s1 = srcX1;
> + t0 = srcY0;
> + t1 = srcY1;
> + normalized = !(sampler_view->texture->flags &
> PIPE_RESOURCE_FLAG_UNNORMALIZED_COORDS_HINT);
> + if(normalized)
> + {
> + s0 /= (float)(u_minify(sampler_view->texture->width0,
> srcsub.level));
> + s1 /= (float)(u_minify(sampler_view->texture->width0,
> srcsub.level));
> + t0 /= (float)(u_minify(sampler_view->texture->height0,
> srcsub.level));
> + t1 /= (float)(u_minify(sampler_view->texture->height0,
> srcsub.level));
> + }
> }
>
>
> @@ -450,6 +469,7 @@ util_blit_pixels_writemask(struct blit_state *ctx,
> cso_set_vertex_elements(ctx->cso, 2, ctx->velem);
>
> /* sampler */
> + ctx->sampler.normalized_coords = normalized;
> ctx->sampler.min_img_filter = filter;
> ctx->sampler.mag_img_filter = filter;
> /* we've limited this already with the sampler view but you never
> know... */
> diff --git a/src/gallium/auxiliary/util/u_blitter.c
> b/src/gallium/auxiliary/util/u_blitter.c
> index b5b86b7..da713a9 100644
> --- a/src/gallium/auxiliary/util/u_blitter.c
> +++ b/src/gallium/auxiliary/util/u_blitter.c
> @@ -92,7 +92,7 @@ struct blitter_context_priv
> void *velem_state;
>
> /* Sampler state for clamping to a miplevel. */
> - void *sampler_state[PIPE_MAX_TEXTURE_LEVELS];
> + void *sampler_state[PIPE_MAX_TEXTURE_LEVELS * 2];
>
> /* Rasterizer state. */
> void *rs_state;
> @@ -271,7 +271,7 @@ void util_blitter_destroy(struct blitter_context
> *blitter)
> if (ctx->fs_col[i])
> pipe->delete_fs_state(pipe, ctx->fs_col[i]);
>
> - for (i = 0; i < PIPE_MAX_TEXTURE_LEVELS; i++)
> + for (i = 0; i < PIPE_MAX_TEXTURE_LEVELS * 2; i++)
> if (ctx->sampler_state[i])
> pipe->delete_sampler_state(pipe, ctx->sampler_state[i]);
>
> @@ -417,16 +417,26 @@ static void blitter_set_clear_color(struct
> blitter_context_priv *ctx,
> }
> }
>
> -static void get_normalized_texcoords(struct pipe_resource *src,
> +static void get_texcoords(struct pipe_resource *src,
> struct pipe_subresource subsrc,
> unsigned x1, unsigned y1,
> unsigned x2, unsigned y2,
> - float out[4])
> + boolean normalized, float out[4])
> {
> - out[0] = x1 / (float)u_minify(src->width0, subsrc.level);
> - out[1] = y1 / (float)u_minify(src->height0, subsrc.level);
> - out[2] = x2 / (float)u_minify(src->width0, subsrc.level);
> - out[3] = y2 / (float)u_minify(src->height0, subsrc.level);
> + if(normalized)
> + {
> + out[0] = x1 / (float)u_minify(src->width0, subsrc.level);
> + out[1] = y1 / (float)u_minify(src->height0, subsrc.level);
> + out[2] = x2 / (float)u_minify(src->width0, subsrc.level);
> + out[3] = y2 / (float)u_minify(src->height0, subsrc.level);
> + }
> + else
> + {
> + out[0] = x1;
> + out[1] = y1;
> + out[2] = x2;
> + out[3] = y2;
> + }
> }
>
> static void set_texcoords_in_vertices(const float coord[4],
> @@ -454,7 +464,7 @@ static void blitter_set_texcoords_2d(struct
> blitter_context_priv *ctx,
> unsigned i;
> float coord[4];
>
> - get_normalized_texcoords(src, subsrc, x1, y1, x2, y2, coord);
> + get_texcoords(src, subsrc, x1, y1, x2, y2, TRUE, coord);
> set_texcoords_in_vertices(coord, &ctx->vertices[0][1][0], 8);
>
> for (i = 0; i < 4; i++) {
> @@ -489,7 +499,7 @@ static void blitter_set_texcoords_cube(struct
> blitter_context_priv *ctx,
> float coord[4];
> float st[4][2];
>
> - get_normalized_texcoords(src, subsrc, x1, y1, x2, y2, coord);
> + get_texcoords(src, subsrc, x1, y1, x2, y2, TRUE, coord);
> set_texcoords_in_vertices(coord, &st[0][0], 2);
>
> util_map_texcoords2d_onto_cubemap(subsrc.face,
> @@ -523,7 +533,7 @@ static void blitter_draw_quad(struct
> blitter_context_priv *ctx)
>
> static INLINE
> void **blitter_get_sampler_state(struct blitter_context_priv *ctx,
> - int miplevel)
> + int miplevel, boolean normalized)
> {
> struct pipe_context *pipe = ctx->base.pipe;
> struct pipe_sampler_state *sampler_state = &ctx->template_sampler_state;
> @@ -531,18 +541,19 @@ void **blitter_get_sampler_state(struct
> blitter_context_priv *ctx,
> assert(miplevel < PIPE_MAX_TEXTURE_LEVELS);
>
> /* Create the sampler state on-demand. */
> - if (!ctx->sampler_state[miplevel]) {
> + if (!ctx->sampler_state[miplevel * 2 + normalized]) {
> sampler_state->lod_bias = miplevel;
> sampler_state->min_lod = miplevel;
> sampler_state->max_lod = miplevel;
> + sampler_state->normalized_coords = normalized;
>
> - ctx->sampler_state[miplevel] = pipe->create_sampler_state(pipe,
> + ctx->sampler_state[miplevel * 2 + normalized] =
> pipe->create_sampler_state(pipe,
>
> sampler_state);
> }
>
> /* Return void** so that it can be passed to
> bind_fragment_sampler_states
> * directly. */
> - return &ctx->sampler_state[miplevel];
> + return &ctx->sampler_state[miplevel * 2 + normalized];
> }
>
> static INLINE
> @@ -716,6 +727,7 @@ void util_blitter_copy_region(struct blitter_context
> *blitter,
> struct pipe_sampler_view viewTempl, *view;
> unsigned bind;
> boolean is_stencil, is_depth;
> + boolean normalized;
>
> /* Give up if textures are not set. */
> assert(dst && src);
> @@ -787,6 +799,8 @@ void util_blitter_copy_region(struct blitter_context
> *blitter,
> fb_state.zsbuf = 0;
> }
>
> + normalized = !(src->flags &
> PIPE_RESOURCE_FLAG_UNNORMALIZED_COORDS_HINT);
> +
> /* Initialize sampler view. */
> u_sampler_view_default_template(&viewTempl, src, src->format);
> view = pipe->create_sampler_view(pipe, src, &viewTempl);
> @@ -795,7 +809,7 @@ void util_blitter_copy_region(struct blitter_context
> *blitter,
> pipe->bind_rasterizer_state(pipe, ctx->rs_state);
> pipe->bind_vs_state(pipe, ctx->vs_tex);
> pipe->bind_fragment_sampler_states(pipe, 1,
> - blitter_get_sampler_state(ctx,
> subsrc.level));
> + blitter_get_sampler_state(ctx,
> subsrc.level, normalized));
> pipe->bind_vertex_elements_state(pipe, ctx->velem_state);
> pipe->set_fragment_sampler_views(pipe, 1, &view);
> pipe->set_framebuffer_state(pipe, &fb_state);
> @@ -809,8 +823,8 @@ void util_blitter_copy_region(struct blitter_context
> *blitter,
> {
> /* Set texture coordinates. */
> float coord[4];
> - get_normalized_texcoords(src, subsrc, srcx, srcy,
> - srcx+width, srcy+height, coord);
> + get_texcoords(src, subsrc, srcx, srcy,
> + srcx+width, srcy+height, normalized,
> coord);
>
> /* Draw. */
> blitter->draw_rectangle(blitter, dstx, dsty, dstx+width,
> dsty+height, 0,
> --
> 1.7.0.4
>
> _______________________________________________
> mesa-dev mailing list
> mesa-dev at lists.freedesktop.org
> http://lists.freedesktop.org/mailman/listinfo/mesa-dev
>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.freedesktop.org/archives/mesa-dev/attachments/20100811/b2ad1e4a/attachment.htm>
More information about the mesa-dev
mailing list