summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--src/mesa/pipe/nouveau/nouveau_push.h (renamed from src/mesa/pipe/nv50/nv50_dma.h)41
-rw-r--r--src/mesa/pipe/nv40/nv40_clear.c2
-rw-r--r--src/mesa/pipe/nv40/nv40_context.c1
-rw-r--r--src/mesa/pipe/nv40/nv40_context.h4
-rw-r--r--src/mesa/pipe/nv40/nv40_fragprog.c1
-rw-r--r--src/mesa/pipe/nv40/nv40_query.c1
-rw-r--r--src/mesa/pipe/nv40/nv40_state.c1
-rw-r--r--src/mesa/pipe/nv40/nv40_state_emit.c1
-rw-r--r--src/mesa/pipe/nv40/nv40_state_tex.c1
-rw-r--r--src/mesa/pipe/nv40/nv40_vbo.c1
-rw-r--r--src/mesa/pipe/nv40/nv40_vertprog.c1
-rw-r--r--src/mesa/pipe/nv50/nv50_clear.c2
-rw-r--r--src/mesa/pipe/nv50/nv50_context.c1
-rw-r--r--src/mesa/pipe/nv50/nv50_context.h4
-rw-r--r--src/mesa/pipe/nv50/nv50_query.c1
-rw-r--r--src/mesa/pipe/nv50/nv50_state.c3
-rw-r--r--src/mesa/pipe/nv50/nv50_vbo.c1
17 files changed, 35 insertions, 32 deletions
diff --git a/src/mesa/pipe/nv50/nv50_dma.h b/src/mesa/pipe/nouveau/nouveau_push.h
index 366316df75..0fc972d2a2 100644
--- a/src/mesa/pipe/nv50/nv50_dma.h
+++ b/src/mesa/pipe/nouveau/nouveau_push.h
@@ -1,15 +1,21 @@
-#ifndef __NV50_DMA_H__
-#define __NV50_DMA_H__
+#ifndef __NOUVEAU_PUSH_H__
+#define __NOUVEAU_PUSH_H__
#include "pipe/nouveau/nouveau_winsys.h"
+#ifndef NOUVEAU_PUSH_CONTEXT
+#error undefined push context
+#endif
+
#define OUT_RING(data) do { \
- (*nv50->nvws->channel->pushbuf->cur++) = (data); \
+ NOUVEAU_PUSH_CONTEXT(pc); \
+ (*pc->nvws->channel->pushbuf->cur++) = (data); \
} while(0)
#define OUT_RINGp(src,size) do { \
- memcpy(nv50->nvws->channel->pushbuf->cur, (src), (size) * 4); \
- nv50->nvws->channel->pushbuf->cur += (size); \
+ NOUVEAU_PUSH_CONTEXT(pc); \
+ memcpy(pc->nvws->channel->pushbuf->cur, (src), (size) * 4); \
+ pc->nvws->channel->pushbuf->cur += (size); \
} while(0)
#define OUT_RINGf(data) do { \
@@ -19,10 +25,11 @@
} while(0)
#define BEGIN_RING(obj,mthd,size) do { \
- if (nv50->nvws->channel->pushbuf->remaining < ((size) + 1)) \
- nv50->nvws->push_flush(nv50->nvws->channel, ((size) + 1)); \
- OUT_RING((nv50->obj->subc << 13) | ((size) << 18) | (mthd)); \
- nv50->nvws->channel->pushbuf->remaining -= ((size) + 1); \
+ NOUVEAU_PUSH_CONTEXT(pc); \
+ if (pc->nvws->channel->pushbuf->remaining < ((size) + 1)) \
+ pc->nvws->push_flush(pc->nvws->channel, ((size) + 1)); \
+ OUT_RING((pc->obj->subc << 13) | ((size) << 18) | (mthd)); \
+ pc->nvws->channel->pushbuf->remaining -= ((size) + 1); \
} while(0)
#define BEGIN_RING_NI(obj,mthd,size) do { \
@@ -30,14 +37,16 @@
} while(0)
#define FIRE_RING() do { \
- nv50->nvws->push_flush(nv50->nvws->channel, 0); \
+ NOUVEAU_PUSH_CONTEXT(pc); \
+ pc->nvws->push_flush(pc->nvws->channel, 0); \
} while(0)
#define OUT_RELOC(bo,data,flags,vor,tor) do { \
- nv50->nvws->push_reloc(nv50->nvws->channel, \
- nv50->nvws->channel->pushbuf->cur, \
- (struct nouveau_bo *)(bo), \
- (data), (flags), (vor), (tor)); \
+ NOUVEAU_PUSH_CONTEXT(pc); \
+ pc->nvws->push_reloc(pc->nvws->channel, \
+ pc->nvws->channel->pushbuf->cur, \
+ (struct nouveau_bo *)(bo), \
+ (data), (flags), (vor), (tor)); \
OUT_RING(0); \
} while(0)
@@ -49,8 +58,8 @@
/* FB/TT object handle */
#define OUT_RELOCo(bo,flags) do { \
OUT_RELOC((bo), 0, (flags) | NOUVEAU_BO_OR, \
- nv50->nvws->channel->vram->handle, \
- nv50->nvws->channel->gart->handle); \
+ pc->nvws->channel->vram->handle, \
+ pc->nvws->channel->gart->handle); \
} while(0)
/* Low 32-bits of offset */
diff --git a/src/mesa/pipe/nv40/nv40_clear.c b/src/mesa/pipe/nv40/nv40_clear.c
index 380a2a642f..2c4e8f01fd 100644
--- a/src/mesa/pipe/nv40/nv40_clear.c
+++ b/src/mesa/pipe/nv40/nv40_clear.c
@@ -3,8 +3,6 @@
#include "pipe/p_state.h"
#include "nv40_context.h"
-#include "nv40_dma.h"
-
void
nv40_clear(struct pipe_context *pipe, struct pipe_surface *ps,
diff --git a/src/mesa/pipe/nv40/nv40_context.c b/src/mesa/pipe/nv40/nv40_context.c
index 442ff04e75..334e50ef89 100644
--- a/src/mesa/pipe/nv40/nv40_context.c
+++ b/src/mesa/pipe/nv40/nv40_context.c
@@ -4,7 +4,6 @@
#include "pipe/p_util.h"
#include "nv40_context.h"
-#include "nv40_dma.h"
static const char *
nv40_get_name(struct pipe_context *pipe)
diff --git a/src/mesa/pipe/nv40/nv40_context.h b/src/mesa/pipe/nv40/nv40_context.h
index 0a89ae8bed..86aebbb927 100644
--- a/src/mesa/pipe/nv40/nv40_context.h
+++ b/src/mesa/pipe/nv40/nv40_context.h
@@ -10,6 +10,10 @@
#include "pipe/nouveau/nouveau_winsys.h"
#include "pipe/nouveau/nouveau_gldefs.h"
+#define NOUVEAU_PUSH_CONTEXT(ctx) \
+ struct nv40_context *ctx = nv40
+#include "pipe/nouveau/nouveau_push.h"
+
#include "nv40_state.h"
#define NOUVEAU_ERR(fmt, args...) \
diff --git a/src/mesa/pipe/nv40/nv40_fragprog.c b/src/mesa/pipe/nv40/nv40_fragprog.c
index 01bf5c3460..fded11d170 100644
--- a/src/mesa/pipe/nv40/nv40_fragprog.c
+++ b/src/mesa/pipe/nv40/nv40_fragprog.c
@@ -7,7 +7,6 @@
#include "pipe/tgsi/util/tgsi_util.h"
#include "nv40_context.h"
-#include "nv40_dma.h"
#define SWZ_X 0
#define SWZ_Y 1
diff --git a/src/mesa/pipe/nv40/nv40_query.c b/src/mesa/pipe/nv40/nv40_query.c
index 6e5fcae8ca..ea30d3ede8 100644
--- a/src/mesa/pipe/nv40/nv40_query.c
+++ b/src/mesa/pipe/nv40/nv40_query.c
@@ -1,7 +1,6 @@
#include "pipe/p_context.h"
#include "nv40_context.h"
-#include "nv40_dma.h"
struct nv40_query {
struct nouveau_resource *object;
diff --git a/src/mesa/pipe/nv40/nv40_state.c b/src/mesa/pipe/nv40/nv40_state.c
index 14e12626d4..41de5650aa 100644
--- a/src/mesa/pipe/nv40/nv40_state.c
+++ b/src/mesa/pipe/nv40/nv40_state.c
@@ -3,7 +3,6 @@
#include "pipe/p_util.h"
#include "nv40_context.h"
-#include "nv40_dma.h"
#include "nv40_state.h"
static void *
diff --git a/src/mesa/pipe/nv40/nv40_state_emit.c b/src/mesa/pipe/nv40/nv40_state_emit.c
index 080ade3827..7bb69e617e 100644
--- a/src/mesa/pipe/nv40/nv40_state_emit.c
+++ b/src/mesa/pipe/nv40/nv40_state_emit.c
@@ -1,5 +1,4 @@
#include "nv40_context.h"
-#include "nv40_dma.h"
#include "nv40_state.h"
void
diff --git a/src/mesa/pipe/nv40/nv40_state_tex.c b/src/mesa/pipe/nv40/nv40_state_tex.c
index 8e8609f5c9..7c353c138f 100644
--- a/src/mesa/pipe/nv40/nv40_state_tex.c
+++ b/src/mesa/pipe/nv40/nv40_state_tex.c
@@ -1,5 +1,4 @@
#include "nv40_context.h"
-#include "nv40_dma.h"
#define _(m,tf,ts0x,ts0y,ts0z,ts0w,ts1x,ts1y,ts1z,ts1w) \
{ \
diff --git a/src/mesa/pipe/nv40/nv40_vbo.c b/src/mesa/pipe/nv40/nv40_vbo.c
index d462e98400..7cf089e007 100644
--- a/src/mesa/pipe/nv40/nv40_vbo.c
+++ b/src/mesa/pipe/nv40/nv40_vbo.c
@@ -3,7 +3,6 @@
#include "pipe/p_util.h"
#include "nv40_context.h"
-#include "nv40_dma.h"
#include "nv40_state.h"
#include "pipe/nouveau/nouveau_channel.h"
diff --git a/src/mesa/pipe/nv40/nv40_vertprog.c b/src/mesa/pipe/nv40/nv40_vertprog.c
index 84618c1e1b..bd052fe834 100644
--- a/src/mesa/pipe/nv40/nv40_vertprog.c
+++ b/src/mesa/pipe/nv40/nv40_vertprog.c
@@ -6,7 +6,6 @@
#include "pipe/tgsi/util/tgsi_parse.h"
#include "nv40_context.h"
-#include "nv40_dma.h"
#include "nv40_state.h"
/* TODO (at least...):
diff --git a/src/mesa/pipe/nv50/nv50_clear.c b/src/mesa/pipe/nv50/nv50_clear.c
index 2b453a49d1..552b92f72e 100644
--- a/src/mesa/pipe/nv50/nv50_clear.c
+++ b/src/mesa/pipe/nv50/nv50_clear.c
@@ -3,8 +3,6 @@
#include "pipe/p_state.h"
#include "nv50_context.h"
-#include "nv50_dma.h"
-
void
nv50_clear(struct pipe_context *pipe, struct pipe_surface *ps,
diff --git a/src/mesa/pipe/nv50/nv50_context.c b/src/mesa/pipe/nv50/nv50_context.c
index ed12c6c0d9..33c8eebb0b 100644
--- a/src/mesa/pipe/nv50/nv50_context.c
+++ b/src/mesa/pipe/nv50/nv50_context.c
@@ -4,7 +4,6 @@
#include "pipe/p_util.h"
#include "nv50_context.h"
-#include "nv50_dma.h"
static boolean
nv50_is_format_supported(struct pipe_context *pipe, enum pipe_format format,
diff --git a/src/mesa/pipe/nv50/nv50_context.h b/src/mesa/pipe/nv50/nv50_context.h
index b1c4d5b894..c43202c3d5 100644
--- a/src/mesa/pipe/nv50/nv50_context.h
+++ b/src/mesa/pipe/nv50/nv50_context.h
@@ -10,6 +10,10 @@
#include "pipe/nouveau/nouveau_winsys.h"
#include "pipe/nouveau/nouveau_gldefs.h"
+#define NOUVEAU_PUSH_CONTEXT(ctx) \
+ struct nv50_context *ctx = nv50
+#include "pipe/nouveau/nouveau_push.h"
+
#include "nv50_state.h"
#define NOUVEAU_ERR(fmt, args...) \
diff --git a/src/mesa/pipe/nv50/nv50_query.c b/src/mesa/pipe/nv50/nv50_query.c
index 69eb0e700b..7e48e5121c 100644
--- a/src/mesa/pipe/nv50/nv50_query.c
+++ b/src/mesa/pipe/nv50/nv50_query.c
@@ -1,7 +1,6 @@
#include "pipe/p_context.h"
#include "nv50_context.h"
-#include "nv50_dma.h"
static struct pipe_query *
nv50_query_create(struct pipe_context *pipe, unsigned type)
diff --git a/src/mesa/pipe/nv50/nv50_state.c b/src/mesa/pipe/nv50/nv50_state.c
index 25eac41c2f..99dcab51b2 100644
--- a/src/mesa/pipe/nv50/nv50_state.c
+++ b/src/mesa/pipe/nv50/nv50_state.c
@@ -3,7 +3,6 @@
#include "pipe/p_util.h"
#include "nv50_context.h"
-#include "nv50_dma.h"
#include "nv50_state.h"
static void *
@@ -85,6 +84,7 @@ static void *
nv50_vp_state_create(struct pipe_context *pipe,
const struct pipe_shader_state *cso)
{
+ return NULL;
}
static void
@@ -101,6 +101,7 @@ static void *
nv50_fp_state_create(struct pipe_context *pipe,
const struct pipe_shader_state *cso)
{
+ return NULL;
}
static void
diff --git a/src/mesa/pipe/nv50/nv50_vbo.c b/src/mesa/pipe/nv50/nv50_vbo.c
index faae08f601..0c9d2806d7 100644
--- a/src/mesa/pipe/nv50/nv50_vbo.c
+++ b/src/mesa/pipe/nv50/nv50_vbo.c
@@ -3,7 +3,6 @@
#include "pipe/p_util.h"
#include "nv50_context.h"
-#include "nv50_dma.h"
#include "nv50_state.h"
boolean
generated by cgit v1.2.3 (git 2.39.1) at 2025-02-27 13:44:47 +0000