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

nv50,nvc0: enable/disable seamless cubemap texturing as requested 

In a situation where the seamless setting isn't available on a
per-texture basis (G200+ Teslas, and all Fermis), assume that all
samplers will have it identically set, and enable accordingly.

This fixes arb_seamless_cubemap piglit test on Fermi and Tesla.

Signed-off-by: Ilia Mirkin <imirkin@alum.mit.edu>
This commit is contained in:
Ilia Mirkin 2016-02-13 22:14:02 -05:00
parent d49307435a
commit 1d1ddfe5f8
12 changed files with 26 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/gallium/drivers/nouveau/nv50/nv50_context.h
View File

@ -153,6 +153,7 @@ struct nv50_context {
uint32_t textures_coherent[3];
struct nv50_tsc_entry *samplers[3][PIPE_MAX_SAMPLERS];
unsigned num_samplers[3];
bool seamless_cube_map;
uint8_t num_so_targets;
uint8_t so_targets_dirty;

2
src/gallium/drivers/nouveau/nv50/nv50_screen.c
View File

@ -565,7 +565,7 @@ nv50_screen_init_hwctx(struct nv50_screen *screen)
if (screen->tesla->oclass >= NVA0_3D_CLASS) {
BEGIN_NV04(push, SUBC_3D(NVA0_3D_TEX_MISC), 1);
PUSH_DATA (push, NVA0_3D_TEX_MISC_SEAMLESS_CUBE_MAP);
PUSH_DATA (push, 0);
}
BEGIN_NV04(push, NV50_3D(SCREEN_Y_CONTROL), 1);

1
src/gallium/drivers/nouveau/nv50/nv50_screen.h
View File

@ -50,6 +50,7 @@ struct nv50_graph_state {
uint8_t num_samplers[3];
uint8_t prim_size;
uint16_t scissor;
bool seamless_cube_map;
};
struct nv50_screen {

2
src/gallium/drivers/nouveau/nv50/nv50_state.c
View File

@ -516,6 +516,8 @@ nv50_sampler_state_create(struct pipe_context *pipe,
so->tsc[1] |= GK104_TSC_1_CUBEMAP_INTERFACE_FILTERING;
if (!cso->normalized_coords)
so->tsc[1] |= GK104_TSC_1_FLOAT_COORD_NORMALIZATION_FORCE_UNNORMALIZED_COORDS;
} else {
so->seamless_cube_map = cso->seamless_cube_map;
}
if (cso->max_anisotropy >= 16)

1
src/gallium/drivers/nouveau/nv50/nv50_stateobj_tex.h
View File

@ -7,6 +7,7 @@
struct nv50_tsc_entry {
int id;
uint32_t tsc[8];
bool seamless_cube_map;
};
static inline struct nv50_tsc_entry *

1
src/gallium/drivers/nouveau/nv50/nv50_tex.c
View File

@ -361,6 +361,7 @@ nv50_validate_tsc(struct nv50_context *nv50, int s)
PUSH_DATA (push, (i << 4) | 0);
continue;
}
nv50->seamless_cube_map = tsc->seamless_cube_map;
if (tsc->id < 0) {
tsc->id = nv50_screen_tsc_alloc(nv50->screen, tsc);

7
src/gallium/drivers/nouveau/nv50/nv50_vbo.c
View File

@ -816,6 +816,13 @@ nv50_draw_vbo(struct pipe_context *pipe, const struct pipe_draw_info *info)
PUSH_DATA (push, 0x20);
}
if (nv50->screen->base.class_3d >= NVA0_3D_CLASS &&
nv50->seamless_cube_map != nv50->state.seamless_cube_map) {
nv50->state.seamless_cube_map = nv50->seamless_cube_map;
BEGIN_NV04(push, SUBC_3D(NVA0_3D_TEX_MISC), 1);
PUSH_DATA (push, nv50->seamless_cube_map ? NVA0_3D_TEX_MISC_SEAMLESS_CUBE_MAP : 0);
}
if (nv50->vbo_fifo) {
nv50_push_vbo(nv50, info);
push->kick_notify = nv50_default_kick_notify;

1
src/gallium/drivers/nouveau/nvc0/nvc0_context.h
View File

@ -157,6 +157,7 @@ struct nvc0_context {
struct nv50_tsc_entry *samplers[6][PIPE_MAX_SAMPLERS];
unsigned num_samplers[6];
uint16_t samplers_dirty[6];
bool seamless_cube_map;
uint32_t tex_handles[6][PIPE_MAX_SAMPLERS]; /* for nve4 */

3
src/gallium/drivers/nouveau/nvc0/nvc0_screen.c
View File

@ -876,8 +876,7 @@ nvc0_screen_create(struct nouveau_device *dev)
BEGIN_NVC0(push, NVC0_3D(SHADE_MODEL), 1);
PUSH_DATA (push, NVC0_3D_SHADE_MODEL_SMOOTH);
if (screen->eng3d->oclass < NVE4_3D_CLASS) {
BEGIN_NVC0(push, NVC0_3D(TEX_MISC), 1);
PUSH_DATA (push, NVC0_3D_TEX_MISC_SEAMLESS_CUBE_MAP);
IMMED_NVC0(push, NVC0_3D(TEX_MISC), 0);
} else {
BEGIN_NVC0(push, NVE4_3D(TEX_CB_INDEX), 1);
PUSH_DATA (push, 15);

1
src/gallium/drivers/nouveau/nvc0/nvc0_screen.h
View File

@ -53,6 +53,7 @@ struct nvc0_graph_state {
uint32_t clip_mode;
uint32_t uniform_buffer_bound[5];
struct nvc0_transform_feedback_state *tfb;
bool seamless_cube_map;
};
struct nvc0_screen {

1
src/gallium/drivers/nouveau/nvc0/nvc0_tex.c
View File

@ -595,6 +595,7 @@ nvc0_validate_tsc(struct nvc0_context *nvc0, int s)
commands[n++] = (i << 4) | 0;
continue;
}
nvc0->seamless_cube_map = tsc->seamless_cube_map;
if (tsc->id < 0) {
tsc->id = nvc0_screen_tsc_alloc(nvc0->screen, tsc);

8
src/gallium/drivers/nouveau/nvc0/nvc0_vbo.c
View File

@ -984,6 +984,14 @@ nvc0_draw_vbo(struct pipe_context *pipe, const struct pipe_draw_info *info)
}
}
if (nvc0->screen->base.class_3d < NVE4_3D_CLASS &&
nvc0->seamless_cube_map != nvc0->state.seamless_cube_map) {
nvc0->state.seamless_cube_map = nvc0->seamless_cube_map;
PUSH_SPACE(push, 1);
IMMED_NVC0(push, NVC0_3D(TEX_MISC),
nvc0->seamless_cube_map ? NVC0_3D_TEX_MISC_SEAMLESS_CUBE_MAP : 0);
}
push->kick_notify = nvc0_draw_vbo_kick_notify;
for (s = 0; s < 5 && !nvc0->cb_dirty; ++s) {