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

nv30: Emit sampler state using state objects

Browse source
This commit is contained in:
Patrice Mandin 2008-07-04 18:53:44 +02:00
parent 77f8167d75
commit f99643ca6e
3 changed files with 46 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/gallium/drivers/nv30/nv30_context.h
View file

@ -96,6 +96,7 @@ struct nv30_state {
unsigned scissor_enabled;
unsigned stipple_enabled;
unsigned viewport_bypass;
unsigned fp_samplers;
uint64_t dirty;
struct nouveau_stateobj *hw[NV30_STATE_MAX];
@ -129,6 +130,8 @@ struct nv30_context {
struct pipe_blend_color blend_colour;
struct pipe_viewport_state viewport;
struct pipe_framebuffer_state framebuffer;
unsigned nr_samplers;
unsigned nr_textures;
uint32_t rt_enable;
struct pipe_buffer *rt[2];

42
src/gallium/drivers/nv30/nv30_state.c
View file

@ -1,6 +1,7 @@
#include "pipe/p_state.h"
#include "pipe/p_defines.h"
#include "pipe/p_util.h"
#include "pipe/p_inlines.h"
#include "nv30_context.h"
#include "nv30_state.h"
@ -116,7 +117,7 @@ nv30_sampler_state_create(struct pipe_context *pipe,
struct nv30_sampler_state *ps;
uint32_t filter = 0;
ps = malloc(sizeof(struct nv30_sampler_state));
ps = MALLOC(sizeof(struct nv30_sampler_state));
ps->fmt = 0;
if (!cso->normalized_coords)
@ -197,6 +198,19 @@ nv30_sampler_state_create(struct pipe_context *pipe,
ps->filt = filter;
/*{
float limit;
limit = CLAMP(cso->lod_bias, -16.0, 15.0);
ps->filt |= (int)(cso->lod_bias * 256.0) & 0x1fff;
limit = CLAMP(cso->max_lod, 0.0, 15.0);
ps->en |= (int)(limit * 256.0) << 7;
limit = CLAMP(cso->min_lod, 0.0, 15.0);
ps->en |= (int)(limit * 256.0) << 19;
}*/
/* if (cso->compare_mode == PIPE_TEX_COMPARE_R_TO_TEXTURE) {
switch (cso->compare_func) {
case PIPE_FUNC_NEVER:
@ -242,20 +256,24 @@ nv30_sampler_state_bind(struct pipe_context *pipe, unsigned nr, void **sampler)
struct nv30_context *nv30 = nv30_context(pipe);
unsigned unit;
if (!sampler) {
return;
}
for (unit = 0; unit < nr; unit++) {
nv30->tex_sampler[unit] = sampler[unit];
nv30->dirty_samplers |= (1 << unit);
}
for (unit = nr; unit < nv30->nr_samplers; unit++) {
nv30->tex_sampler[unit] = NULL;
nv30->dirty_samplers |= (1 << unit);
}
nv30->nr_samplers = nr;
nv30->dirty |= NV30_NEW_SAMPLER;
}
static void
nv30_sampler_state_delete(struct pipe_context *pipe, void *hwcso)
{
free(hwcso);
FREE(hwcso);
}
static void
@ -266,9 +284,19 @@ nv30_set_sampler_texture(struct pipe_context *pipe, unsigned nr,
unsigned unit;
for (unit = 0; unit < nr; unit++) {
nv30->tex_miptree[unit] = (struct nv30_miptree *)miptree[unit];
pipe_texture_reference((struct pipe_texture **)
&nv30->tex_miptree[unit], miptree[unit]);
nv30->dirty_samplers |= (1 << unit);
}
for (unit = nr; unit < nv30->nr_textures; unit++) {
pipe_texture_reference((struct pipe_texture **)
&nv30->tex_miptree[unit], NULL);
nv30->dirty_samplers |= (1 << unit);
}
nv30->nr_textures = nr;
nv30->dirty |= NV30_NEW_SAMPLER;
}
static void *

9
src/gallium/drivers/nv30/nv30_state_emit.c
View file

@ -47,7 +47,7 @@ nv30_emit_hw_state(struct nv30_context *nv30)
{
struct nv30_state *state = &nv30->state;
struct nv30_screen *screen = nv30->screen;
unsigned i;
unsigned i, samplers;
uint64 states;
if (nv30->pctx_id != screen->cur_pctx) {
@ -91,6 +91,13 @@ nv30_emit_hw_state(struct nv30_context *nv30)
nv30->dirty_samplers = 0;
so_emit_reloc_markers(nv30->nvws, state->hw[NV30_STATE_FB]);
for (i = 0, samplers = state->fp_samplers; i < 16 && samplers; i++) {
if (!(samplers & (1 << i)))
continue;
so_emit_reloc_markers(nv30->nvws,
state->hw[NV30_STATE_FRAGTEX0+i]);
samplers &= ~(1ULL << i);
}
/* Texture images, emitted in nv30_fragtex_build */
#if 0