fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-05-05 18:18:06 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

nv20: Enable ARB_texture_border_clamp

Browse source 
Fixes quite a few 'texwrap [12]d border color only' tests on NV20
(10de:0201).  All told, 40 more tests pass.

Signed-off-by: Ilia Mirkin <imirkin@alum.mit.edu>
Reviewed-by: Ian RomanicK <ian.d.romanick@intel.com>
Reviewed-by: Francisco Jerez <currojerez@riseup.net>
Tested-by: Ian RomanicK <ian.d.romanick@intel.com>
This commit is contained in:
Ilia Mirkin 2016-09-08 20:56:59 -04:00 • committed by Ian Romanick
parent 953a3cf0fd
commit c5b4a5b967
1 changed files with 28 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

29
src/mesa/drivers/dri/nouveau/nv20_state_tex.c
View file

@ -165,7 +165,8 @@ nv20_emit_tex_obj(struct gl_context *ctx, int emit)
struct nouveau_surface *s;
struct gl_texture_image *ti;
const struct gl_sampler_object *sa;
uint32_t tx_format, tx_filter, tx_wrap, tx_enable;
uint8_t r, g, b, a;
uint32_t tx_format, tx_filter, tx_wrap, tx_bcolor, tx_enable;
PUSH_RESET(push, BUFCTX_TEX(i));
@ -211,6 +212,29 @@ nv20_emit_tex_obj(struct gl_context *ctx, int emit)
| nvgl_filter_mode(sa->MinFilter) << 16
| 2 << 12;
r = FLOAT_TO_UBYTE(sa->BorderColor.f[0]);
g = FLOAT_TO_UBYTE(sa->BorderColor.f[1]);
b = FLOAT_TO_UBYTE(sa->BorderColor.f[2]);
a = FLOAT_TO_UBYTE(sa->BorderColor.f[3]);
switch (ti->_BaseFormat) {
case GL_LUMINANCE:
a = 0xff;
/* fallthrough */
case GL_LUMINANCE_ALPHA:
g = b = r;
break;
case GL_RGB:
a = 0xff;
break;
case GL_INTENSITY:
g = b = a = r;
break;
case GL_ALPHA:
r = g = b = 0;
break;
}
tx_bcolor = b << 0 | g << 8 | r << 16 | a << 24;
tx_enable = NV20_3D_TEX_ENABLE_ENABLE
| log2i(sa->MaxAnisotropy) << 4;
@ -259,6 +283,9 @@ nv20_emit_tex_obj(struct gl_context *ctx, int emit)
BEGIN_NV04(push, NV20_3D(TEX_FILTER(i)), 1);
PUSH_DATA (push, tx_filter);
BEGIN_NV04(push, NV20_3D(TEX_BORDER_COLOR(i)), 1);
PUSH_DATA (push, tx_bcolor);
BEGIN_NV04(push, NV20_3D(TEX_ENABLE(i)), 1);
PUSH_DATA (push, tx_enable);