+/*
+ * Copyright 2012 Red Hat Inc.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * 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 NONINFRINGEMENT. IN NO EVENT SHALL
+ * THE AUTHORS 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: Ben Skeggs
+ *
+ */
+
+#include "util/u_inlines.h"
+
+#include "nouveau/nv_object.xml.h"
+#include "nv30-40_3d.xml.h"
#include "nv30_context.h"
-#include "nouveau/nouveau_util.h"
-
-#define _(m,tf,ts0x,ts0y,ts0z,ts0w,ts1x,ts1y,ts1z,ts1w) \
-{ \
- TRUE, \
- PIPE_FORMAT_##m, \
- NV34TCL_TX_FORMAT_FORMAT_##tf, \
- (NV34TCL_TX_SWIZZLE_S0_X_##ts0x | NV34TCL_TX_SWIZZLE_S0_Y_##ts0y | \
- NV34TCL_TX_SWIZZLE_S0_Z_##ts0z | NV34TCL_TX_SWIZZLE_S0_W_##ts0w | \
- NV34TCL_TX_SWIZZLE_S1_X_##ts1x | NV34TCL_TX_SWIZZLE_S1_Y_##ts1y | \
- NV34TCL_TX_SWIZZLE_S1_Z_##ts1z | NV34TCL_TX_SWIZZLE_S1_W_##ts1w) \
+#include "nv30_format.h"
+
+void
+nv30_fragtex_validate(struct nv30_context *nv30)
+{
+ struct pipe_screen *pscreen = &nv30->screen->base.base;
+ struct nouveau_object *eng3d = nv30->screen->eng3d;
+ struct nouveau_pushbuf *push = nv30->base.pushbuf;
+ unsigned dirty = nv30->fragprog.dirty_samplers;
+
+ while (dirty) {
+ unsigned unit = ffs(dirty) - 1;
+ struct nv30_sampler_view *sv = (void *)nv30->fragprog.textures[unit];
+ struct nv30_sampler_state *ss = nv30->fragprog.samplers[unit];
+
+ PUSH_RESET(push, BUFCTX_FRAGTEX(unit));
+
+ if (ss && sv) {
+ const struct nv30_texfmt *fmt = nv30_texfmt(pscreen, sv->pipe.format);
+ struct pipe_resource *pt = sv->pipe.texture;
+ struct nv30_miptree *mt = nv30_miptree(pt);
+ unsigned min_lod, max_lod;
+ u32 filter = sv->filt | (ss->filt & sv->filt_mask);
+ u32 format = sv->fmt | ss->fmt;
+ u32 enable = ss->en;
+
+ /* handle base_level when not using a mip filter, min/max level
+ * is unfortunately ignored by the hardware otherwise
+ */
+ if (ss->pipe.min_mip_filter == PIPE_TEX_MIPFILTER_NONE) {
+ if (sv->base_lod)
+ filter += 0x00020000; /* N/L -> NMN/LMN */
+ max_lod = sv->base_lod;
+ min_lod = sv->base_lod;
+ } else {
+ max_lod = MIN2(ss->max_lod + sv->base_lod, sv->high_lod);
+ min_lod = MIN2(ss->min_lod + sv->base_lod, max_lod);
+ }
+
+ if (eng3d->oclass >= NV40_3D_CLASS) {
+ /* this is a tad stupid of the hardware, but there's no non-rcomp
+ * z16/z24 texture formats to be had, we have to suffer and lose
+ * some precision to handle this case.
+ */
+ if (ss->pipe.compare_mode != PIPE_TEX_COMPARE_R_TO_TEXTURE) {
+ if (fmt->nv40 == NV40_3D_TEX_FORMAT_FORMAT_Z16)
+ format |= NV40_3D_TEX_FORMAT_FORMAT_A8L8;
+ else
+ if (fmt->nv40 == NV40_3D_TEX_FORMAT_FORMAT_Z24)
+ format |= NV40_3D_TEX_FORMAT_FORMAT_A16L16;
+ else
+ format |= fmt->nv40;
+ } else {
+ format |= fmt->nv40;
+ }
+
+ enable |= (min_lod << 19) | (max_lod << 7);
+ enable |= NV40_3D_TEX_ENABLE_ENABLE;
+
+ BEGIN_NV04(push, NV40_3D(TEX_SIZE1(unit)), 1);
+ PUSH_DATA (push, sv->npot_size1);
+ } else {
+ /* this is a tad stupid of the hardware, but there's no non-rcomp
+ * z16/z24 texture formats to be had, we have to suffer and lose
+ * some precision to handle this case.
+ */
+ if (ss->pipe.compare_mode != PIPE_TEX_COMPARE_R_TO_TEXTURE) {
+ if (fmt->nv30 == NV30_3D_TEX_FORMAT_FORMAT_Z16) {
+ if (ss->pipe.normalized_coords)
+ format |= NV30_3D_TEX_FORMAT_FORMAT_A8L8;
+ else
+ format |= NV30_3D_TEX_FORMAT_FORMAT_A8L8_RECT;
+ } else
+ if (fmt->nv30 == NV30_3D_TEX_FORMAT_FORMAT_Z24) {
+ if (ss->pipe.normalized_coords)
+ format |= NV30_3D_TEX_FORMAT_FORMAT_HILO16;
+ else
+ format |= NV30_3D_TEX_FORMAT_FORMAT_HILO16_RECT;
+ } else {
+ if (ss->pipe.normalized_coords)
+ format |= fmt->nv30;
+ else
+ format |= fmt->nv30_rect;
+ }
+ } else {
+ if (ss->pipe.normalized_coords)
+ format |= fmt->nv30;
+ else
+ format |= fmt->nv30_rect;
+ }
+
+ enable |= NV30_3D_TEX_ENABLE_ENABLE;
+ enable |= (min_lod << 18) | (max_lod << 6);
+ }
+
+ BEGIN_NV04(push, NV30_3D(TEX_OFFSET(unit)), 8);
+ PUSH_MTHDl(push, NV30_3D(TEX_OFFSET(unit)), BUFCTX_FRAGTEX(unit),
+ mt->base.bo, 0, NOUVEAU_BO_VRAM | NOUVEAU_BO_RD);
+ PUSH_MTHDs(push, NV30_3D(TEX_FORMAT(unit)), BUFCTX_FRAGTEX(unit),
+ mt->base.bo, format, NOUVEAU_BO_VRAM | NOUVEAU_BO_RD,
+ NV30_3D_TEX_FORMAT_DMA0,
+ NV30_3D_TEX_FORMAT_DMA1);
+ PUSH_DATA (push, sv->wrap | (ss->wrap & sv->wrap_mask));
+ PUSH_DATA (push, enable);
+ PUSH_DATA (push, sv->swz);
+ PUSH_DATA (push, filter);
+ PUSH_DATA (push, sv->npot_size0);
+ PUSH_DATA (push, ss->bcol);
+ BEGIN_NV04(push, NV30_3D(TEX_FILTER_OPTIMIZATION(unit)), 1);
+ PUSH_DATA (push, nv30->config.filter);
+ } else {
+ BEGIN_NV04(push, NV30_3D(TEX_ENABLE(unit)), 1);
+ PUSH_DATA (push, 0);
+ }
+
+ dirty &= ~(1 << unit);
+ }
+
+ nv30->fragprog.dirty_samplers = 0;
}
-struct nv30_texture_format {
- boolean defined;
- uint pipe;
- int format;
- int swizzle;
-};
-
-static struct nv30_texture_format
-nv30_texture_formats[] = {
- _(X8R8G8B8_UNORM, A8R8G8B8, S1, S1, S1, ONE, X, Y, Z, W),
- _(A8R8G8B8_UNORM, A8R8G8B8, S1, S1, S1, S1, X, Y, Z, W),
- _(A1R5G5B5_UNORM, A1R5G5B5, S1, S1, S1, S1, X, Y, Z, W),
- _(A4R4G4B4_UNORM, A4R4G4B4, S1, S1, S1, S1, X, Y, Z, W),
- _(R5G6B5_UNORM , R5G6B5 , S1, S1, S1, ONE, X, Y, Z, W),
- _(L8_UNORM , L8 , S1, S1, S1, ONE, X, X, X, X),
- _(A8_UNORM , L8 , ZERO, ZERO, ZERO, S1, X, X, X, X),
- _(I8_UNORM , L8 , S1, S1, S1, S1, X, X, X, X),
- _(A8L8_UNORM , A8L8 , S1, S1, S1, S1, X, X, X, Y),
- _(Z16_UNORM , R5G6B5 , S1, S1, S1, ONE, X, X, X, X),
- _(Z24S8_UNORM , A8R8G8B8, S1, S1, S1, ONE, X, X, X, X),
- _(DXT1_RGB , DXT1 , S1, S1, S1, ONE, X, Y, Z, W),
- _(DXT1_RGBA , DXT1 , S1, S1, S1, S1, X, Y, Z, W),
- _(DXT3_RGBA , DXT3 , S1, S1, S1, S1, X, Y, Z, W),
- _(DXT5_RGBA , DXT5 , S1, S1, S1, S1, X, Y, Z, W),
- {},
-};
-
-static struct nv30_texture_format *
-nv30_fragtex_format(uint pipe_format)
+static void
+nv30_fragtex_sampler_states_bind(struct pipe_context *pipe,
+ unsigned nr, void **hwcso)
{
- struct nv30_texture_format *tf = nv30_texture_formats;
- char fs[128];
+ struct nv30_context *nv30 = nv30_context(pipe);
+ unsigned i;
- while (tf->defined) {
- if (tf->pipe == pipe_format)
- return tf;
- tf++;
- }
+ for (i = 0; i < nr; i++) {
+ nv30->fragprog.samplers[i] = hwcso[i];
+ nv30->fragprog.dirty_samplers |= (1 << i);
+ }
- NOUVEAU_ERR("unknown texture format %s\n", pf_name(pipe_format));
- return NULL;
+ for (; i < nv30->fragprog.num_samplers; i++) {
+ nv30->fragprog.samplers[i] = NULL;
+ nv30->fragprog.dirty_samplers |= (1 << i);
+ }
+
+ nv30->fragprog.num_samplers = nr;
+ nv30->dirty |= NV30_NEW_FRAGTEX;
}
-static struct nouveau_stateobj *
-nv30_fragtex_build(struct nv30_context *nv30, int unit)
+static void
+nv30_fragtex_set_sampler_views(struct pipe_context *pipe, unsigned nr,
+ struct pipe_sampler_view **views)
{
- struct nv30_sampler_state *ps = nv30->tex_sampler[unit];
- struct nv30_miptree *nv30mt = nv30->tex_miptree[unit];
- struct pipe_texture *pt = &nv30mt->base;
- struct nouveau_bo *bo = nouveau_bo(nv30mt->buffer);
- struct nv30_texture_format *tf;
- struct nouveau_stateobj *so;
- uint32_t txf, txs , txp;
- unsigned tex_flags = NOUVEAU_BO_VRAM | NOUVEAU_BO_GART | NOUVEAU_BO_RD;
-
- tf = nv30_fragtex_format(pt->format);
- if (!tf)
- return NULL;
-
- txf = tf->format;
- txf |= ((pt->last_level>0) ? NV34TCL_TX_FORMAT_MIPMAP : 0);
- txf |= log2i(pt->width[0]) << NV34TCL_TX_FORMAT_BASE_SIZE_U_SHIFT;
- txf |= log2i(pt->height[0]) << NV34TCL_TX_FORMAT_BASE_SIZE_V_SHIFT;
- txf |= log2i(pt->depth[0]) << NV34TCL_TX_FORMAT_BASE_SIZE_W_SHIFT;
- txf |= NV34TCL_TX_FORMAT_NO_BORDER | 0x10000;
-
- switch (pt->target) {
- case PIPE_TEXTURE_CUBE:
- txf |= NV34TCL_TX_FORMAT_CUBIC;
- /* fall-through */
- case PIPE_TEXTURE_2D:
- txf |= NV34TCL_TX_FORMAT_DIMS_2D;
- break;
- case PIPE_TEXTURE_3D:
- txf |= NV34TCL_TX_FORMAT_DIMS_3D;
- break;
- case PIPE_TEXTURE_1D:
- txf |= NV34TCL_TX_FORMAT_DIMS_1D;
- break;
- default:
- NOUVEAU_ERR("Unknown target %d\n", pt->target);
- return NULL;
- }
-
- if (!(pt->tex_usage & NOUVEAU_TEXTURE_USAGE_LINEAR)) {
- txp = 0;
- } else {
- txp = nv30mt->level[0].pitch;
- txf |= (1<<13) /*FIXME: NV34TCL_TX_FORMAT_LINEAR ? */;
- }
-
- txs = tf->swizzle;
-
- so = so_new(16, 2);
- so_method(so, nv30->screen->rankine, NV34TCL_TX_OFFSET(unit), 8);
- so_reloc (so, bo, 0, tex_flags | NOUVEAU_BO_LOW, 0, 0);
- so_reloc (so, bo, txf, tex_flags | NOUVEAU_BO_OR,
- NV34TCL_TX_FORMAT_DMA0, NV34TCL_TX_FORMAT_DMA1);
- so_data (so, ps->wrap);
- so_data (so, NV34TCL_TX_ENABLE_ENABLE | ps->en);
- so_data (so, txs);
- so_data (so, ps->filt | 0x2000 /*voodoo*/);
- so_data (so, (pt->width[0] << NV34TCL_TX_NPOT_SIZE_W_SHIFT) |
- pt->height[0]);
- so_data (so, ps->bcol);
-
- return so;
+ struct nv30_context *nv30 = nv30_context(pipe);
+ unsigned i;
+
+ for (i = 0; i < nr; i++) {
+ nouveau_bufctx_reset(nv30->bufctx, BUFCTX_FRAGTEX(i));
+ pipe_sampler_view_reference(&nv30->fragprog.textures[i], views[i]);
+ nv30->fragprog.dirty_samplers |= (1 << i);
+ }
+
+ for (; i < nv30->fragprog.num_textures; i++) {
+ nouveau_bufctx_reset(nv30->bufctx, BUFCTX_FRAGTEX(i));
+ pipe_sampler_view_reference(&nv30->fragprog.textures[i], NULL);
+ nv30->fragprog.dirty_samplers |= (1 << i);
+ }
+
+ nv30->fragprog.num_textures = nr;
+ nv30->dirty |= NV30_NEW_FRAGTEX;
}
-static boolean
-nv30_fragtex_validate(struct nv30_context *nv30)
+void
+nv30_fragtex_init(struct pipe_context *pipe)
{
- struct nv30_fragment_program *fp = nv30->fragprog;
- struct nv30_state *state = &nv30->state;
- struct nouveau_stateobj *so;
- unsigned samplers, unit;
-
- samplers = state->fp_samplers & ~fp->samplers;
- while (samplers) {
- unit = ffs(samplers) - 1;
- samplers &= ~(1 << unit);
-
- so = so_new(2, 0);
- so_method(so, nv30->screen->rankine, NV34TCL_TX_ENABLE(unit), 1);
- so_data (so, 0);
- so_ref(so, &nv30->state.hw[NV30_STATE_FRAGTEX0 + unit]);
- so_ref(NULL, &so);
- state->dirty |= (1ULL << (NV30_STATE_FRAGTEX0 + unit));
- }
-
- samplers = nv30->dirty_samplers & fp->samplers;
- while (samplers) {
- unit = ffs(samplers) - 1;
- samplers &= ~(1 << unit);
-
- so = nv30_fragtex_build(nv30, unit);
- so_ref(so, &nv30->state.hw[NV30_STATE_FRAGTEX0 + unit]);
- so_ref(NULL, &so);
- state->dirty |= (1ULL << (NV30_STATE_FRAGTEX0 + unit));
- }
-
- nv30->state.fp_samplers = fp->samplers;
- return FALSE;
+ pipe->bind_fragment_sampler_states = nv30_fragtex_sampler_states_bind;
+ pipe->set_fragment_sampler_views = nv30_fragtex_set_sampler_views;
}
-
-struct nv30_state_entry nv30_state_fragtex = {
- .validate = nv30_fragtex_validate,
- .dirty = {
- .pipe = NV30_NEW_SAMPLER | NV30_NEW_FRAGPROG,
- .hw = 0
- }
-};
projects / mesa.git / blobdiff