nv50: fix bogus error message about 3d surfaces

[mesa.git] / src / gallium / drivers / nvfx / nvfx_context.h

diff --git a/src/gallium/drivers/nvfx/nvfx_context.h b/src/gallium/drivers/nvfx/nvfx_context.h
index b837437c58fd034928b065bdf253fc39c1d0ab5a..dad912b2aee05c5ffae9278d33b1285084a33897 100644 (file)
--- a/src/gallium/drivers/nvfx/nvfx_context.h
+++ b/src/gallium/drivers/nvfx/nvfx_context.h
@@ -18,7 +18,8 @@
 
 #include "nouveau/nouveau_winsys.h"
 #include "nouveau/nouveau_gldefs.h"
-
+#include "nouveau/nouveau_resource.h"
+#include "nv30-40_3d.xml.h"
 #include "nvfx_state.h"
 
 #define NOUVEAU_ERR(fmt, args...) \
@@ -141,6 +142,7 @@ struct nvfx_context {
        struct nvfx_screen *screen;
 
        unsigned is_nv4x; /* either 0 or ~0 */
+       unsigned use_nv4x; /* either 0 or ~0 */
        boolean use_vp_clipping;
 
        struct draw_context *draw;
@@ -151,14 +153,6 @@ struct nvfx_context {
 
        /* HW state derived from pipe states */
        struct nvfx_state state;
-       struct {
-               struct nvfx_vertex_program *vertprog;
-
-               unsigned nr_attribs;
-               unsigned hw[PIPE_MAX_SHADER_INPUTS];
-               unsigned draw[PIPE_MAX_SHADER_INPUTS];
-               unsigned emit[PIPE_MAX_SHADER_INPUTS];
-       } swtnl;
 
        enum {
                HW, SWTNL, SWRAST
@@ -170,7 +164,7 @@ struct nvfx_context {
        struct pipe_scissor_state scissor;
        unsigned stipple[32];
        struct pipe_clip_state clip;
-       struct nvfx_vertex_program *vertprog;
+       struct nvfx_pipe_vertex_program *vertprog;
        struct nvfx_pipe_fragment_program *fragprog;
        struct pipe_resource *constbuf[PIPE_SHADER_TYPES];
        unsigned constbuf_nr[PIPE_SHADER_TYPES];
@@ -185,6 +179,7 @@ struct nvfx_context {
        struct nvfx_sampler_state *tex_sampler[PIPE_MAX_SAMPLERS];
        struct pipe_sampler_view *fragment_sampler_views[PIPE_MAX_SAMPLERS];
        struct nvfx_pipe_fragment_program* dummy_fs;
+       struct pipe_query* query;
 
        unsigned nr_samplers;
        unsigned nr_textures;
@@ -208,6 +203,7 @@ struct nvfx_context {
        int hw_pointsprite_control;
        int hw_vp_output;
        struct nvfx_fragment_program* hw_fragprog;
+       struct nvfx_vertex_program* hw_vertprog;
 
        unsigned relocs_needed;
 };
@@ -326,6 +322,7 @@ extern void nvfx_init_transfer_functions(struct pipe_context *pipe);
 
 /* nvfx_vbo.c */
 extern boolean nvfx_vbo_validate(struct nvfx_context *nvfx);
+extern void nvfx_vbo_swtnl_validate(struct nvfx_context *nvfx);
 extern void nvfx_vbo_relocate(struct nvfx_context *nvfx);
 extern void nvfx_idxbuf_validate(struct nvfx_context* nvfx);
 extern void nvfx_idxbuf_relocate(struct nvfx_context* nvfx);
@@ -343,30 +340,31 @@ extern void nvfx_init_vertprog_functions(struct nvfx_context *nvfx);
 /* nvfx_push.c */
 extern void nvfx_push_vbo(struct pipe_context *pipe, const struct pipe_draw_info *info);
 
-/* must WAIT_RING(chan, ncomp + 1) or equivalent beforehand! */
-static inline void nvfx_emit_vtx_attr(struct nouveau_channel* chan, unsigned attrib, const float* v, unsigned ncomp)
+static inline void nvfx_emit_vtx_attr(struct nouveau_channel* chan,
+               struct nouveau_grobj *eng3d, unsigned attrib, const float* v,
+               unsigned ncomp)
 {
        switch (ncomp) {
        case 4:
-               OUT_RING(chan, RING_3D(NV34TCL_VTX_ATTR_4F_X(attrib), 4));
+               BEGIN_RING(chan, eng3d, NV30_3D_VTX_ATTR_4F_X(attrib), 4);
                OUT_RING(chan, fui(v[0]));
                OUT_RING(chan, fui(v[1]));
                OUT_RING(chan,  fui(v[2]));
                OUT_RING(chan,  fui(v[3]));
                break;
        case 3:
-               OUT_RING(chan, RING_3D(NV34TCL_VTX_ATTR_3F_X(attrib), 3));
+               BEGIN_RING(chan, eng3d, NV30_3D_VTX_ATTR_3F_X(attrib), 3);
                OUT_RING(chan,  fui(v[0]));
                OUT_RING(chan,  fui(v[1]));
                OUT_RING(chan,  fui(v[2]));
                break;
        case 2:
-               OUT_RING(chan, RING_3D(NV34TCL_VTX_ATTR_2F_X(attrib), 2));
+               BEGIN_RING(chan, eng3d, NV30_3D_VTX_ATTR_2F_X(attrib), 2);
                OUT_RING(chan,  fui(v[0]));
                OUT_RING(chan,  fui(v[1]));
                break;
        case 1:
-               OUT_RING(chan, RING_3D(NV34TCL_VTX_ATTR_1F(attrib), 1));
+               BEGIN_RING(chan, eng3d, NV30_3D_VTX_ATTR_1F(attrib), 1);
                OUT_RING(chan,  fui(v[0]));
                break;
        }