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

gallium: move border color to be a color union 

EXT_texture_integer also specifies border color should be a color
union, the values are used according to the texture sampler format.

(update docs)

Signed-off-by: Dave Airlie <airlied@redhat.com>
Reviewed-by: Brian Paul <brianp@vmware.com>
This commit is contained in:
Dave Airlie 2011-09-27 10:08:34 +01:00
parent 0527c11d7a
commit 9f61e43b49
19 changed files with 44 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/gallium/auxiliary/draw/draw_llvm.c
View File

@ -1509,7 +1509,7 @@ draw_llvm_set_sampler_state(struct draw_context *draw)
jit_tex->min_lod = draw->samplers[i]->min_lod; jit_tex->min_lod = draw->samplers[i]->min_lod;
jit_tex->max_lod = draw->samplers[i]->max_lod; jit_tex->max_lod = draw->samplers[i]->max_lod;
jit_tex->lod_bias = draw->samplers[i]->lod_bias; jit_tex->lod_bias = draw->samplers[i]->lod_bias;
COPY_4V(jit_tex->border_color, draw->samplers[i]->border_color); COPY_4V(jit_tex->border_color, draw->samplers[i]->border_color.f);
} }
} }
} }

2
src/gallium/auxiliary/util/u_dump_state.c
View File

@ -617,7 +617,7 @@ util_dump_sampler_state(struct os_stream *stream, const struct pipe_sampler_stat
util_dump_member(stream, float, state, lod_bias); util_dump_member(stream, float, state, lod_bias);
util_dump_member(stream, float, state, min_lod); util_dump_member(stream, float, state, min_lod);
util_dump_member(stream, float, state, max_lod); util_dump_member(stream, float, state, max_lod);
util_dump_member_array(stream, float, state, border_color); util_dump_member_array(stream, float, state, border_color.f);
util_dump_struct_end(stream); util_dump_struct_end(stream);
} }

5
src/gallium/docs/source/cso/sampler.rst
View File

@ -99,8 +99,9 @@ min_lod
max_lod max_lod
Maximum level of detail, used to clamp LOD after bias. Maximum level of detail, used to clamp LOD after bias.
border_color border_color
RGBA color used for texel coordinates that are outside the [0,width-1], Color union used for texel coordinates that are outside the [0,width-1],
[0, height-1] or [0, depth-1] ranges. [0, height-1] or [0, depth-1] ranges. Interpreted according to sampler
view format.
max_anisotropy max_anisotropy
Maximum anistropy ratio to use when sampling from textures. For example, Maximum anistropy ratio to use when sampling from textures. For example,
if max_anistropy=4, a region of up to 1 by 4 texels will be sampled. if max_anistropy=4, a region of up to 1 by 4 texels will be sampled.

8
src/gallium/drivers/i915/i915_state.c
View File

@ -279,10 +279,10 @@ i915_create_sampler_state(struct pipe_context *pipe,
} }
{ {
ubyte r = float_to_ubyte(sampler->border_color[0]); ubyte r = float_to_ubyte(sampler->border_color.f[0]);
ubyte g = float_to_ubyte(sampler->border_color[1]); ubyte g = float_to_ubyte(sampler->border_color.f[1]);
ubyte b = float_to_ubyte(sampler->border_color[2]); ubyte b = float_to_ubyte(sampler->border_color.f[2]);
ubyte a = float_to_ubyte(sampler->border_color[3]); ubyte a = float_to_ubyte(sampler->border_color.f[3]);
cso->state[2] = I915PACKCOLOR8888(r, g, b, a); cso->state[2] = I915PACKCOLOR8888(r, g, b, a);
} }
return cso; return cso;

2
src/gallium/drivers/llvmpipe/lp_setup.c
View File

@ -729,7 +729,7 @@ lp_setup_set_fragment_sampler_state(struct lp_setup_context *setup,
jit_tex->min_lod = sampler->min_lod; jit_tex->min_lod = sampler->min_lod;
jit_tex->max_lod = sampler->max_lod; jit_tex->max_lod = sampler->max_lod;
jit_tex->lod_bias = sampler->lod_bias; jit_tex->lod_bias = sampler->lod_bias;
COPY_4V(jit_tex->border_color, sampler->border_color); COPY_4V(jit_tex->border_color, sampler->border_color.f);
} }
} }

8
src/gallium/drivers/nv50/nv50_state.c
View File

@ -508,10 +508,10 @@ nv50_sampler_state_create(struct pipe_context *pipe,
so->tsc[2] |= so->tsc[2] |=
(((int)(f[1] * 256.0f) & 0xfff) << 12) | ((int)(f[0] * 256.0f) & 0xfff); (((int)(f[1] * 256.0f) & 0xfff) << 12) | ((int)(f[0] * 256.0f) & 0xfff);
so->tsc[4] = fui(cso->border_color[0]); so->tsc[4] = fui(cso->border_color.f[0]);
so->tsc[5] = fui(cso->border_color[1]); so->tsc[5] = fui(cso->border_color.f[1]);
so->tsc[6] = fui(cso->border_color[2]); so->tsc[6] = fui(cso->border_color.f[2]);
so->tsc[7] = fui(cso->border_color[3]); so->tsc[7] = fui(cso->border_color.f[3]);
return (void *)so; return (void *)so;
} }

2
src/gallium/drivers/nvfx/nvfx_fragtex.c
View File

@ -25,7 +25,7 @@ nvfx_sampler_state_create(struct pipe_context *pipe,
ps->wrap |= nvfx_tex_wrap_compare_mode(cso->compare_func); ps->wrap |= nvfx_tex_wrap_compare_mode(cso->compare_func);
ps->compare = TRUE; ps->compare = TRUE;
} }
ps->bcol = nvfx_tex_border_color(cso->border_color); ps->bcol = nvfx_tex_border_color(cso->border_color.f);
if(nvfx->is_nv4x) if(nvfx->is_nv4x)
nv40_sampler_state_init(pipe, ps, cso); nv40_sampler_state_init(pipe, ps, cso);

2
src/gallium/drivers/r300/r300_state_derived.c
View File

@ -762,7 +762,7 @@ static void r300_merge_textures_and_samplers(struct r300_context* r300)
/* Set the border color. */ /* Set the border color. */
texstate->border_color = texstate->border_color =
r300_get_border_color(view->base.format, r300_get_border_color(view->base.format,
sampler->state.border_color, sampler->state.border_color.f,
r300->screen->caps.is_r500); r300->screen->caps.is_r500);
/* determine min/max levels */ /* determine min/max levels */

10
src/gallium/drivers/r600/evergreen_state.c
View File

@ -938,7 +938,7 @@ static void *evergreen_create_sampler_state(struct pipe_context *ctx,
} }
rstate->id = R600_PIPE_STATE_SAMPLER; rstate->id = R600_PIPE_STATE_SAMPLER;
util_pack_color(state->border_color, PIPE_FORMAT_B8G8R8A8_UNORM, &uc); util_pack_color(state->border_color.f, PIPE_FORMAT_B8G8R8A8_UNORM, &uc);
r600_pipe_state_add_reg_noblock(rstate, R_03C000_SQ_TEX_SAMPLER_WORD0_0, r600_pipe_state_add_reg_noblock(rstate, R_03C000_SQ_TEX_SAMPLER_WORD0_0,
S_03C000_CLAMP_X(r600_tex_wrap(state->wrap_s)) | S_03C000_CLAMP_X(r600_tex_wrap(state->wrap_s)) |
S_03C000_CLAMP_Y(r600_tex_wrap(state->wrap_t)) | S_03C000_CLAMP_Y(r600_tex_wrap(state->wrap_t)) |
@ -960,10 +960,10 @@ static void *evergreen_create_sampler_state(struct pipe_context *ctx,
0xFFFFFFFF, NULL, 0); 0xFFFFFFFF, NULL, 0);
if (uc.ui) { if (uc.ui) {
r600_pipe_state_add_reg_noblock(rstate, R_00A404_TD_PS_SAMPLER0_BORDER_RED, fui(state->border_color[0]), 0xFFFFFFFF, NULL, 0); r600_pipe_state_add_reg_noblock(rstate, R_00A404_TD_PS_SAMPLER0_BORDER_RED, fui(state->border_color.f[0]), 0xFFFFFFFF, NULL, 0);
r600_pipe_state_add_reg_noblock(rstate, R_00A408_TD_PS_SAMPLER0_BORDER_GREEN, fui(state->border_color[1]), 0xFFFFFFFF, NULL, 0); r600_pipe_state_add_reg_noblock(rstate, R_00A408_TD_PS_SAMPLER0_BORDER_GREEN, fui(state->border_color.f[1]), 0xFFFFFFFF, NULL, 0);
r600_pipe_state_add_reg_noblock(rstate, R_00A40C_TD_PS_SAMPLER0_BORDER_BLUE, fui(state->border_color[2]), 0xFFFFFFFF, NULL, 0); r600_pipe_state_add_reg_noblock(rstate, R_00A40C_TD_PS_SAMPLER0_BORDER_BLUE, fui(state->border_color.f[2]), 0xFFFFFFFF, NULL, 0);
r600_pipe_state_add_reg_noblock(rstate, R_00A410_TD_PS_SAMPLER0_BORDER_ALPHA, fui(state->border_color[3]), 0xFFFFFFFF, NULL, 0); r600_pipe_state_add_reg_noblock(rstate, R_00A410_TD_PS_SAMPLER0_BORDER_ALPHA, fui(state->border_color.f[3]), 0xFFFFFFFF, NULL, 0);
} }
return rstate; return rstate;
} }

10
src/gallium/drivers/r600/r600_state.c
View File

@ -981,7 +981,7 @@ static void *r600_create_sampler_state(struct pipe_context *ctx,
ss->seamless_cube_map = state->seamless_cube_map; ss->seamless_cube_map = state->seamless_cube_map;
rstate = &ss->rstate; rstate = &ss->rstate;
rstate->id = R600_PIPE_STATE_SAMPLER; rstate->id = R600_PIPE_STATE_SAMPLER;
util_pack_color(state->border_color, PIPE_FORMAT_B8G8R8A8_UNORM, &uc); util_pack_color(state->border_color.f, PIPE_FORMAT_B8G8R8A8_UNORM, &uc);
r600_pipe_state_add_reg_noblock(rstate, R_03C000_SQ_TEX_SAMPLER_WORD0_0, r600_pipe_state_add_reg_noblock(rstate, R_03C000_SQ_TEX_SAMPLER_WORD0_0,
S_03C000_CLAMP_X(r600_tex_wrap(state->wrap_s)) | S_03C000_CLAMP_X(r600_tex_wrap(state->wrap_s)) |
S_03C000_CLAMP_Y(r600_tex_wrap(state->wrap_t)) | S_03C000_CLAMP_Y(r600_tex_wrap(state->wrap_t)) |
@ -998,10 +998,10 @@ static void *r600_create_sampler_state(struct pipe_context *ctx,
S_03C004_LOD_BIAS(S_FIXED(CLAMP(state->lod_bias, -16, 16), 6)), 0xFFFFFFFF, NULL, 0); S_03C004_LOD_BIAS(S_FIXED(CLAMP(state->lod_bias, -16, 16), 6)), 0xFFFFFFFF, NULL, 0);
r600_pipe_state_add_reg_noblock(rstate, R_03C008_SQ_TEX_SAMPLER_WORD2_0, S_03C008_TYPE(1), 0xFFFFFFFF, NULL, 0); r600_pipe_state_add_reg_noblock(rstate, R_03C008_SQ_TEX_SAMPLER_WORD2_0, S_03C008_TYPE(1), 0xFFFFFFFF, NULL, 0);
if (uc.ui) { if (uc.ui) {
r600_pipe_state_add_reg_noblock(rstate, R_00A400_TD_PS_SAMPLER0_BORDER_RED, fui(state->border_color[0]), 0xFFFFFFFF, NULL, 0); r600_pipe_state_add_reg_noblock(rstate, R_00A400_TD_PS_SAMPLER0_BORDER_RED, fui(state->border_color.f[0]), 0xFFFFFFFF, NULL, 0);
r600_pipe_state_add_reg_noblock(rstate, R_00A404_TD_PS_SAMPLER0_BORDER_GREEN, fui(state->border_color[1]), 0xFFFFFFFF, NULL, 0); r600_pipe_state_add_reg_noblock(rstate, R_00A404_TD_PS_SAMPLER0_BORDER_GREEN, fui(state->border_color.f[1]), 0xFFFFFFFF, NULL, 0);
r600_pipe_state_add_reg_noblock(rstate, R_00A408_TD_PS_SAMPLER0_BORDER_BLUE, fui(state->border_color[2]), 0xFFFFFFFF, NULL, 0); r600_pipe_state_add_reg_noblock(rstate, R_00A408_TD_PS_SAMPLER0_BORDER_BLUE, fui(state->border_color.f[2]), 0xFFFFFFFF, NULL, 0);
r600_pipe_state_add_reg_noblock(rstate, R_00A40C_TD_PS_SAMPLER0_BORDER_ALPHA, fui(state->border_color[3]), 0xFFFFFFFF, NULL, 0); r600_pipe_state_add_reg_noblock(rstate, R_00A40C_TD_PS_SAMPLER0_BORDER_ALPHA, fui(state->border_color.f[3]), 0xFFFFFFFF, NULL, 0);
} }
return rstate; return rstate;
} }

8
src/gallium/drivers/softpipe/sp_tex_sample.c
View File

@ -672,7 +672,7 @@ get_texel_2d(const struct sp_sampler_variant *samp,
if (x < 0 || x >= (int) u_minify(texture->width0, level) || if (x < 0 || x >= (int) u_minify(texture->width0, level) ||
y < 0 || y >= (int) u_minify(texture->height0, level)) { y < 0 || y >= (int) u_minify(texture->height0, level)) {
return samp->sampler->border_color; return samp->sampler->border_color.f;
} }
else { else {
return get_texel_2d_no_border( samp, addr, x, y ); return get_texel_2d_no_border( samp, addr, x, y );
@ -766,7 +766,7 @@ get_texel_3d(const struct sp_sampler_variant *samp,
if (x < 0 || x >= (int) u_minify(texture->width0, level) || if (x < 0 || x >= (int) u_minify(texture->width0, level) ||
y < 0 || y >= (int) u_minify(texture->height0, level) || y < 0 || y >= (int) u_minify(texture->height0, level) ||
z < 0 || z >= (int) u_minify(texture->depth0, level)) { z < 0 || z >= (int) u_minify(texture->depth0, level)) {
return samp->sampler->border_color; return samp->sampler->border_color.f;
} }
else { else {
return get_texel_3d_no_border( samp, addr, x, y, z ); return get_texel_3d_no_border( samp, addr, x, y, z );
@ -783,7 +783,7 @@ get_texel_1d_array(const struct sp_sampler_variant *samp,
unsigned level = addr.bits.level; unsigned level = addr.bits.level;
if (x < 0 || x >= (int) u_minify(texture->width0, level)) { if (x < 0 || x >= (int) u_minify(texture->width0, level)) {
return samp->sampler->border_color; return samp->sampler->border_color.f;
} }
else { else {
return get_texel_2d_no_border(samp, addr, x, y); return get_texel_2d_no_border(samp, addr, x, y);
@ -803,7 +803,7 @@ get_texel_2d_array(const struct sp_sampler_variant *samp,
if (x < 0 || x >= (int) u_minify(texture->width0, level) || if (x < 0 || x >= (int) u_minify(texture->width0, level) ||
y < 0 || y >= (int) u_minify(texture->height0, level)) { y < 0 || y >= (int) u_minify(texture->height0, level)) {
return samp->sampler->border_color; return samp->sampler->border_color.f;
} }
else { else {
return get_texel_3d_no_border(samp, addr, x, y, layer); return get_texel_3d_no_border(samp, addr, x, y, layer);

8
src/gallium/drivers/svga/svga_pipe_sampler.c
View File

@ -113,10 +113,10 @@ svga_create_sampler_state(struct pipe_context *pipe,
cso->compare_func = sampler->compare_func; cso->compare_func = sampler->compare_func;
{ {
uint32 r = float_to_ubyte(sampler->border_color[0]); uint32 r = float_to_ubyte(sampler->border_color.f[0]);
uint32 g = float_to_ubyte(sampler->border_color[1]); uint32 g = float_to_ubyte(sampler->border_color.f[1]);
uint32 b = float_to_ubyte(sampler->border_color[2]); uint32 b = float_to_ubyte(sampler->border_color.f[2]);
uint32 a = float_to_ubyte(sampler->border_color[3]); uint32 a = float_to_ubyte(sampler->border_color.f[3]);
cso->bordercolor = (a << 24) | (r << 16) | (g << 8) | b; cso->bordercolor = (a << 24) | (r << 16) | (g << 8) | b;
} }

2
src/gallium/drivers/trace/tr_dump_state.c
View File

@ -447,7 +447,7 @@ void trace_dump_sampler_state(const struct pipe_sampler_state *state)
trace_dump_member(float, state, lod_bias); trace_dump_member(float, state, lod_bias);
trace_dump_member(float, state, min_lod); trace_dump_member(float, state, min_lod);
trace_dump_member(float, state, max_lod); trace_dump_member(float, state, max_lod);
trace_dump_member_array(float, state, border_color); trace_dump_member_array(float, state, border_color.f);
trace_dump_struct_end(); trace_dump_struct_end();
} }

2
src/gallium/include/pipe/p_state.h
View File

@ -272,7 +272,7 @@ struct pipe_sampler_state
unsigned seamless_cube_map:1; unsigned seamless_cube_map:1;
float lod_bias; /**< LOD/lambda bias */ float lod_bias; /**< LOD/lambda bias */
float min_lod, max_lod; /**< LOD clamp range, after bias */ float min_lod, max_lod; /**< LOD clamp range, after bias */
float border_color[4]; union pipe_color_union border_color;
}; };

8
src/gallium/state_trackers/d3d1x/gd3d11/d3d11_context.h
View File

@ -228,10 +228,10 @@ struct GalliumD3D10Device : public GalliumD3D10ScreenImpl<threadsafe>
samplerd.wrap_r = PIPE_TEX_WRAP_CLAMP_TO_EDGE; samplerd.wrap_r = PIPE_TEX_WRAP_CLAMP_TO_EDGE;
samplerd.wrap_s = PIPE_TEX_WRAP_CLAMP_TO_EDGE; samplerd.wrap_s = PIPE_TEX_WRAP_CLAMP_TO_EDGE;
samplerd.wrap_t = PIPE_TEX_WRAP_CLAMP_TO_EDGE; samplerd.wrap_t = PIPE_TEX_WRAP_CLAMP_TO_EDGE;
samplerd.border_color[0] = 1.0f; samplerd.border_color.f[0] = 1.0f;
samplerd.border_color[1] = 1.0f; samplerd.border_color.f[1] = 1.0f;
samplerd.border_color[2] = 1.0f; samplerd.border_color.f[2] = 1.0f;
samplerd.border_color[3] = 1.0f; samplerd.border_color.f[3] = 1.0f;
samplerd.min_lod = -FLT_MAX; samplerd.min_lod = -FLT_MAX;
samplerd.max_lod = FLT_MAX; samplerd.max_lod = FLT_MAX;
samplerd.max_anisotropy = 1; samplerd.max_anisotropy = 1;

2
src/gallium/state_trackers/d3d1x/gd3d11/d3d11_screen.h
View File

@ -553,7 +553,7 @@ struct GalliumD3D11ScreenImpl : public GalliumD3D11Screen
state.wrap_t = d3d11_to_pipe_wrap[sampler_desc->AddressV]; state.wrap_t = d3d11_to_pipe_wrap[sampler_desc->AddressV];
state.wrap_r = d3d11_to_pipe_wrap[sampler_desc->AddressW]; state.wrap_r = d3d11_to_pipe_wrap[sampler_desc->AddressW];
state.lod_bias = sampler_desc->MipLODBias; state.lod_bias = sampler_desc->MipLODBias;
memcpy(state.border_color, sampler_desc->BorderColor, sizeof(state.border_color)); memcpy(state.border_color.f, sampler_desc->BorderColor, sizeof(state.border_color));
state.min_lod = sampler_desc->MinLOD; state.min_lod = sampler_desc->MinLOD;
state.max_lod = sampler_desc->MaxLOD; state.max_lod = sampler_desc->MaxLOD;

2
src/gallium/state_trackers/vega/api_filters.c
View File

@ -194,7 +194,7 @@ static void execute_filter(struct vg_context *ctx,
case VG_TILE_FILL: case VG_TILE_FILL:
tex_wrap = PIPE_TEX_WRAP_CLAMP_TO_BORDER; tex_wrap = PIPE_TEX_WRAP_CLAMP_TO_BORDER;
/* copy border color */ /* copy border color */
memcpy(sampler.border_color, ctx->state.vg.tile_fill_color, memcpy(sampler.border_color.f, ctx->state.vg.tile_fill_color,
sizeof(sampler.border_color)); sizeof(sampler.border_color));
break; break;
case VG_TILE_PAD: case VG_TILE_PAD:

2
src/gallium/state_trackers/vega/paint.c
View File

@ -652,7 +652,7 @@ VGint paint_bind_samplers(struct vg_paint *paint, struct pipe_sampler_state **sa
} }
break; break;
case VG_PAINT_TYPE_PATTERN: { case VG_PAINT_TYPE_PATTERN: {
memcpy(paint->pattern.sampler.border_color, memcpy(paint->pattern.sampler.border_color.f,
ctx->state.vg.tile_fill_color, ctx->state.vg.tile_fill_color,
sizeof(VGfloat) * 4); sizeof(VGfloat) * 4);
paint->pattern.sampler.min_img_filter = image_sampler_filter(ctx); paint->pattern.sampler.min_img_filter = image_sampler_filter(ctx);

2
src/mesa/state_tracker/st_atom_sampler.c
View File

@ -176,7 +176,7 @@ convert_sampler(struct st_context *st,
st_translate_color(msamp->BorderColor.f, st_translate_color(msamp->BorderColor.f,
teximg ? teximg->_BaseFormat : GL_RGBA, teximg ? teximg->_BaseFormat : GL_RGBA,
sampler->border_color); sampler->border_color.f);
} }
sampler->max_anisotropy = (msamp->MaxAnisotropy == 1.0 ? sampler->max_anisotropy = (msamp->MaxAnisotropy == 1.0 ?