#include "nouveau_context.h"
#include "nouveau_gldefs.h"
#include "nouveau_texture.h"
-#include "nouveau_class.h"
+#include "nv10_3d.xml.h"
#include "nouveau_util.h"
#include "nv10_driver.h"
-
-#define TX_GEN_MODE(i, j) (NV10TCL_TX_GEN_MODE_S(i) + 4 * (j))
-#define TX_GEN_COEFF(i, j) (NV10TCL_TX_GEN_COEFF_S_A(i) + 16 * (j))
-#define TX_MATRIX(i) (NV10TCL_TX0_MATRIX(0) + 64 * (i))
+#include "main/samplerobj.h"
void
-nv10_emit_tex_gen(GLcontext *ctx, int emit)
+nv10_emit_tex_gen(struct gl_context *ctx, int emit)
{
const int i = emit - NOUVEAU_STATE_TEX_GEN0;
struct nouveau_context *nctx = to_nouveau_context(ctx);
- struct nouveau_channel *chan = context_chan(ctx);
- struct nouveau_grobj *celsius = context_eng3d(ctx);
+ struct nouveau_pushbuf *push = context_push(ctx);
struct gl_texture_unit *unit = &ctx->Texture.Unit[i];
int j;
float *k = get_texgen_coeff(coord);
if (k) {
- BEGIN_RING(chan, celsius,
- TX_GEN_COEFF(i, j), 4);
- OUT_RINGf(chan, k[0]);
- OUT_RINGf(chan, k[1]);
- OUT_RINGf(chan, k[2]);
- OUT_RINGf(chan, k[3]);
+ BEGIN_NV04(push, NV10_3D(TEX_GEN_COEFF(i, j)), 4);
+ PUSH_DATAp(push, k, 4);
}
- BEGIN_RING(chan, celsius, TX_GEN_MODE(i, j), 1);
- OUT_RING(chan, nvgl_texgen_mode(coord->Mode));
+ BEGIN_NV04(push, NV10_3D(TEX_GEN_MODE(i,j)), 1);
+ PUSH_DATA (push, nvgl_texgen_mode(coord->Mode));
} else {
- BEGIN_RING(chan, celsius, TX_GEN_MODE(i, j), 1);
- OUT_RING(chan, 0);
+ BEGIN_NV04(push, NV10_3D(TEX_GEN_MODE(i,j)), 1);
+ PUSH_DATA (push, 0);
}
}
}
void
-nv10_emit_tex_mat(GLcontext *ctx, int emit)
+nv10_emit_tex_mat(struct gl_context *ctx, int emit)
{
const int i = emit - NOUVEAU_STATE_TEX_MAT0;
struct nouveau_context *nctx = to_nouveau_context(ctx);
- struct nouveau_channel *chan = context_chan(ctx);
- struct nouveau_grobj *celsius = context_eng3d(ctx);
+ struct nouveau_pushbuf *push = context_push(ctx);
if (nctx->fallback == HWTNL &&
((ctx->Texture._TexMatEnabled & 1 << i) ||
ctx->Texture.Unit[i]._GenFlags)) {
- BEGIN_RING(chan, celsius, NV10TCL_TX_MATRIX_ENABLE(i), 1);
- OUT_RING(chan, 1);
+ BEGIN_NV04(push, NV10_3D(TEX_MATRIX_ENABLE(i)), 1);
+ PUSH_DATA (push, 1);
- BEGIN_RING(chan, celsius, TX_MATRIX(i), 16);
- OUT_RINGm(chan, ctx->TextureMatrixStack[i].Top->m);
+ BEGIN_NV04(push, NV10_3D(TEX_MATRIX(i, 0)), 16);
+ PUSH_DATAm(push, ctx->TextureMatrixStack[i].Top->m);
} else {
- BEGIN_RING(chan, celsius, NV10TCL_TX_MATRIX_ENABLE(i), 1);
- OUT_RING(chan, 0);
+ BEGIN_NV04(push, NV10_3D(TEX_MATRIX_ENABLE(i)), 1);
+ PUSH_DATA (push, 0);
}
}
get_tex_format_pot(struct gl_texture_image *ti)
{
switch (ti->TexFormat) {
- case MESA_FORMAT_ARGB8888:
- return NV10TCL_TX_FORMAT_FORMAT_A8R8G8B8;
+ case MESA_FORMAT_B8G8R8A8_UNORM:
+ return NV10_3D_TEX_FORMAT_FORMAT_A8R8G8B8;
+
+ case MESA_FORMAT_B8G8R8X8_UNORM:
+ return NV10_3D_TEX_FORMAT_FORMAT_X8R8G8B8;
- case MESA_FORMAT_XRGB8888:
- return NV10TCL_TX_FORMAT_FORMAT_X8R8G8B8;
+ case MESA_FORMAT_B5G5R5A1_UNORM:
+ return NV10_3D_TEX_FORMAT_FORMAT_A1R5G5B5;
- case MESA_FORMAT_ARGB1555:
- return NV10TCL_TX_FORMAT_FORMAT_A1R5G5B5;
+ case MESA_FORMAT_B4G4R4A4_UNORM:
+ return NV10_3D_TEX_FORMAT_FORMAT_A4R4G4B4;
- case MESA_FORMAT_ARGB4444:
- return NV10TCL_TX_FORMAT_FORMAT_A4R4G4B4;
+ case MESA_FORMAT_B5G6R5_UNORM:
+ return NV10_3D_TEX_FORMAT_FORMAT_R5G6B5;
- case MESA_FORMAT_RGB565:
- return NV10TCL_TX_FORMAT_FORMAT_R5G6B5;
+ case MESA_FORMAT_A_UNORM8:
+ case MESA_FORMAT_I_UNORM8:
+ return NV10_3D_TEX_FORMAT_FORMAT_I8;
- case MESA_FORMAT_A8:
- case MESA_FORMAT_I8:
- return NV10TCL_TX_FORMAT_FORMAT_A8;
+ case MESA_FORMAT_L_UNORM8:
+ return NV10_3D_TEX_FORMAT_FORMAT_L8;
- case MESA_FORMAT_L8:
- return NV10TCL_TX_FORMAT_FORMAT_L8;
+ case MESA_FORMAT_RGB_DXT1:
+ case MESA_FORMAT_RGBA_DXT1:
+ return NV10_3D_TEX_FORMAT_FORMAT_DXT1;
- case MESA_FORMAT_CI8:
- return NV10TCL_TX_FORMAT_FORMAT_INDEX8;
+ case MESA_FORMAT_RGBA_DXT3:
+ return NV10_3D_TEX_FORMAT_FORMAT_DXT3;
+
+ case MESA_FORMAT_RGBA_DXT5:
+ return NV10_3D_TEX_FORMAT_FORMAT_DXT5;
default:
assert(0);
get_tex_format_rect(struct gl_texture_image *ti)
{
switch (ti->TexFormat) {
- case MESA_FORMAT_ARGB1555:
- return NV10TCL_TX_FORMAT_FORMAT_A1R5G5B5_RECT;
+ case MESA_FORMAT_B5G5R5A1_UNORM:
+ return NV10_3D_TEX_FORMAT_FORMAT_A1R5G5B5_RECT;
- case MESA_FORMAT_RGB565:
- return NV10TCL_TX_FORMAT_FORMAT_R5G6B5_RECT;
+ case MESA_FORMAT_B5G6R5_UNORM:
+ return NV10_3D_TEX_FORMAT_FORMAT_R5G6B5_RECT;
- case MESA_FORMAT_ARGB8888:
- case MESA_FORMAT_XRGB8888:
- return NV10TCL_TX_FORMAT_FORMAT_A8R8G8B8_RECT;
+ case MESA_FORMAT_B8G8R8A8_UNORM:
+ case MESA_FORMAT_B8G8R8X8_UNORM:
+ return NV10_3D_TEX_FORMAT_FORMAT_A8R8G8B8_RECT;
- case MESA_FORMAT_A8:
- case MESA_FORMAT_L8:
- case MESA_FORMAT_I8:
- return NV10TCL_TX_FORMAT_FORMAT_A8_RECT;
+ case MESA_FORMAT_A_UNORM8:
+ case MESA_FORMAT_L_UNORM8:
+ case MESA_FORMAT_I_UNORM8:
+ return NV10_3D_TEX_FORMAT_FORMAT_I8_RECT;
default:
assert(0);
}
void
-nv10_emit_tex_obj(GLcontext *ctx, int emit)
+nv10_emit_tex_obj(struct gl_context *ctx, int emit)
{
const int i = emit - NOUVEAU_STATE_TEX_OBJ0;
- struct nouveau_channel *chan = context_chan(ctx);
- struct nouveau_grobj *celsius = context_eng3d(ctx);
- struct nouveau_bo_context *bctx = context_bctx_i(ctx, TEXTURE, i);
+ struct nouveau_pushbuf *push = context_push(ctx);
const int bo_flags = NOUVEAU_BO_RD | NOUVEAU_BO_GART | NOUVEAU_BO_VRAM;
struct gl_texture_object *t;
struct nouveau_surface *s;
struct gl_texture_image *ti;
+ const struct gl_sampler_object *sa;
uint32_t tx_format, tx_filter, tx_enable;
- if (!ctx->Texture.Unit[i]._ReallyEnabled) {
- BEGIN_RING(chan, celsius, NV10TCL_TX_ENABLE(i), 1);
- OUT_RING(chan, 0);
+ PUSH_RESET(push, BUFCTX_TEX(i));
+
+ if (!ctx->Texture.Unit[i]._Current) {
+ BEGIN_NV04(push, NV10_3D(TEX_ENABLE(i)), 1);
+ PUSH_DATA (push, 0);
return;
}
t = ctx->Texture.Unit[i]._Current;
s = &to_nouveau_texture(t)->surfaces[t->BaseLevel];
ti = t->Image[0][t->BaseLevel];
+ sa = _mesa_get_samplerobj(ctx, i);
if (!nouveau_texture_validate(ctx, t))
return;
/* Recompute the texturing registers. */
- tx_format = nvgl_wrap_mode(t->WrapT) << 28
- | nvgl_wrap_mode(t->WrapS) << 24
+ tx_format = nvgl_wrap_mode(sa->WrapT) << 28
+ | nvgl_wrap_mode(sa->WrapS) << 24
| ti->HeightLog2 << 20
| ti->WidthLog2 << 16
| 5 << 4 | 1 << 12;
- tx_filter = nvgl_filter_mode(t->MagFilter) << 28
- | nvgl_filter_mode(t->MinFilter) << 24;
+ tx_filter = nvgl_filter_mode(sa->MagFilter) << 28
+ | nvgl_filter_mode(sa->MinFilter) << 24;
- tx_enable = NV10TCL_TX_ENABLE_ENABLE
- | log2i(t->MaxAnisotropy) << 4;
+ tx_enable = NV10_3D_TEX_ENABLE_ENABLE
+ | log2i(sa->MaxAnisotropy) << 4;
if (t->Target == GL_TEXTURE_RECTANGLE) {
- BEGIN_RING(chan, celsius, NV10TCL_TX_NPOT_PITCH(i), 1);
- OUT_RING(chan, s->pitch << 16);
- BEGIN_RING(chan, celsius, NV10TCL_TX_NPOT_SIZE(i), 1);
- OUT_RING(chan, align(s->width, 2) << 16 | s->height);
+ BEGIN_NV04(push, NV10_3D(TEX_NPOT_PITCH(i)), 1);
+ PUSH_DATA (push, s->pitch << 16);
+ BEGIN_NV04(push, NV10_3D(TEX_NPOT_SIZE(i)), 1);
+ PUSH_DATA (push, align(s->width, 2) << 16 | s->height);
tx_format |= get_tex_format_rect(ti);
} else {
tx_format |= get_tex_format_pot(ti);
}
- if (t->MinFilter != GL_NEAREST &&
- t->MinFilter != GL_LINEAR) {
- int lod_min = t->MinLod;
- int lod_max = MIN2(t->MaxLod, t->_MaxLambda);
- int lod_bias = t->LodBias
+ if (sa->MinFilter != GL_NEAREST &&
+ sa->MinFilter != GL_LINEAR) {
+ int lod_min = sa->MinLod;
+ int lod_max = MIN2(sa->MaxLod, t->_MaxLambda);
+ int lod_bias = sa->LodBias
+ ctx->Texture.Unit[i].LodBias;
lod_max = CLAMP(lod_max, 0, 15);
lod_min = CLAMP(lod_min, 0, 15);
lod_bias = CLAMP(lod_bias, 0, 15);
- tx_format |= NV10TCL_TX_FORMAT_MIPMAP;
+ tx_format |= NV10_3D_TEX_FORMAT_MIPMAP;
tx_filter |= lod_bias << 8;
tx_enable |= lod_min << 26
| lod_max << 14;
}
/* Write it to the hardware. */
- nouveau_bo_mark(bctx, celsius, NV10TCL_TX_FORMAT(i),
- s->bo, tx_format, 0,
- NV10TCL_TX_FORMAT_DMA0,
- NV10TCL_TX_FORMAT_DMA1,
- bo_flags | NOUVEAU_BO_OR);
+ BEGIN_NV04(push, NV10_3D(TEX_FORMAT(i)), 1);
+ PUSH_MTHD (push, NV10_3D(TEX_FORMAT(i)), BUFCTX_TEX(i),
+ s->bo, tx_format, bo_flags | NOUVEAU_BO_OR,
+ NV10_3D_TEX_FORMAT_DMA0,
+ NV10_3D_TEX_FORMAT_DMA1);
- nouveau_bo_markl(bctx, celsius, NV10TCL_TX_OFFSET(i),
- s->bo, 0, bo_flags);
+ BEGIN_NV04(push, NV10_3D(TEX_OFFSET(i)), 1);
+ PUSH_MTHDl(push, NV10_3D(TEX_OFFSET(i)), BUFCTX_TEX(i),
+ s->bo, s->offset, bo_flags);
- BEGIN_RING(chan, celsius, NV10TCL_TX_FILTER(i), 1);
- OUT_RING(chan, tx_filter);
+ BEGIN_NV04(push, NV10_3D(TEX_FILTER(i)), 1);
+ PUSH_DATA (push, tx_filter);
- BEGIN_RING(chan, celsius, NV10TCL_TX_ENABLE(i), 1);
- OUT_RING(chan, tx_enable);
+ BEGIN_NV04(push, NV10_3D(TEX_ENABLE(i)), 1);
+ PUSH_DATA (push, tx_enable);
}
projects / mesa.git / blobdiff