summaryrefslogtreecommitdiffstats
path: root/src/mesa/state_tracker
diff options
context:
space:
mode:
Diffstat (limited to 'src/mesa/state_tracker')
-rw-r--r--src/mesa/state_tracker/st_atom_blend.c92
-rw-r--r--src/mesa/state_tracker/st_atom_cbuf.c6
-rw-r--r--src/mesa/state_tracker/st_atom_clip.c8
-rw-r--r--src/mesa/state_tracker/st_atom_depth.c26
-rw-r--r--src/mesa/state_tracker/st_atom_fs.c6
-rw-r--r--src/mesa/state_tracker/st_atom_scissor.c6
-rw-r--r--src/mesa/state_tracker/st_atom_setup.c6
-rw-r--r--src/mesa/state_tracker/st_atom_stencil.c44
-rw-r--r--src/mesa/state_tracker/st_atom_viewport.c6
-rw-r--r--src/mesa/state_tracker/st_context.c8
-rw-r--r--src/mesa/state_tracker/st_context.h26
-rw-r--r--src/mesa/state_tracker/st_draw.c8
-rw-r--r--src/mesa/state_tracker/st_public.h4
13 files changed, 123 insertions, 123 deletions
diff --git a/src/mesa/state_tracker/st_atom_blend.c b/src/mesa/state_tracker/st_atom_blend.c
index eabb9172ba5..03fbd290e0e 100644
--- a/src/mesa/state_tracker/st_atom_blend.c
+++ b/src/mesa/state_tracker/st_atom_blend.c
@@ -34,12 +34,12 @@
#include "st_context.h"
#include "st_atom.h"
-#include "softpipe/sp_context.h"
-#include "softpipe/sp_defines.h"
+#include "pipe/p_context.h"
+#include "pipe/p_defines.h"
/**
- * Convert GLenum blend tokens to softpipe tokens.
+ * Convert GLenum blend tokens to pipe tokens.
* Both blend factors and blend funcs are accepted.
*/
static GLuint
@@ -48,54 +48,54 @@ gl_blend_to_sp(GLenum blend)
switch (blend) {
/* blend functions */
case GL_FUNC_ADD:
- return SP_BLEND_ADD;
+ return PIPE_BLEND_ADD;
case GL_FUNC_SUBTRACT:
- return SP_BLEND_SUBTRACT;
+ return PIPE_BLEND_SUBTRACT;
case GL_FUNC_REVERSE_SUBTRACT:
- return SP_BLEND_REVERSE_SUBTRACT;
+ return PIPE_BLEND_REVERSE_SUBTRACT;
case GL_MIN:
- return SP_BLEND_MIN;
+ return PIPE_BLEND_MIN;
case GL_MAX:
- return SP_BLEND_MAX;
+ return PIPE_BLEND_MAX;
/* blend factors */
case GL_ONE:
- return SP_BLENDFACTOR_ONE;
+ return PIPE_BLENDFACTOR_ONE;
case GL_SRC_COLOR:
- return SP_BLENDFACTOR_SRC_COLOR;
+ return PIPE_BLENDFACTOR_SRC_COLOR;
case GL_SRC_ALPHA:
- return SP_BLENDFACTOR_SRC_ALPHA;
+ return PIPE_BLENDFACTOR_SRC_ALPHA;
case GL_DST_ALPHA:
- return SP_BLENDFACTOR_DST_ALPHA;
+ return PIPE_BLENDFACTOR_DST_ALPHA;
case GL_DST_COLOR:
- return SP_BLENDFACTOR_DST_COLOR;
+ return PIPE_BLENDFACTOR_DST_COLOR;
case GL_SRC_ALPHA_SATURATE:
- return SP_BLENDFACTOR_SRC_ALPHA_SATURATE;
+ return PIPE_BLENDFACTOR_SRC_ALPHA_SATURATE;
case GL_CONSTANT_COLOR:
- return SP_BLENDFACTOR_CONST_COLOR;
+ return PIPE_BLENDFACTOR_CONST_COLOR;
case GL_CONSTANT_ALPHA:
- return SP_BLENDFACTOR_CONST_ALPHA;
+ return PIPE_BLENDFACTOR_CONST_ALPHA;
/*
- return SP_BLENDFACTOR_SRC1_COLOR;
- return SP_BLENDFACTOR_SRC1_ALPHA;
+ return PIPE_BLENDFACTOR_SRC1_COLOR;
+ return PIPE_BLENDFACTOR_SRC1_ALPHA;
*/
case GL_ZERO:
- return SP_BLENDFACTOR_ZERO;
+ return PIPE_BLENDFACTOR_ZERO;
case GL_ONE_MINUS_SRC_COLOR:
- return SP_BLENDFACTOR_INV_SRC_COLOR;
+ return PIPE_BLENDFACTOR_INV_SRC_COLOR;
case GL_ONE_MINUS_SRC_ALPHA:
- return SP_BLENDFACTOR_INV_SRC_ALPHA;
+ return PIPE_BLENDFACTOR_INV_SRC_ALPHA;
case GL_ONE_MINUS_DST_COLOR:
- return SP_BLENDFACTOR_INV_DST_ALPHA;
+ return PIPE_BLENDFACTOR_INV_DST_ALPHA;
case GL_ONE_MINUS_DST_ALPHA:
- return SP_BLENDFACTOR_INV_DST_COLOR;
+ return PIPE_BLENDFACTOR_INV_DST_COLOR;
case GL_ONE_MINUS_CONSTANT_COLOR:
- return SP_BLENDFACTOR_INV_CONST_COLOR;
+ return PIPE_BLENDFACTOR_INV_CONST_COLOR;
case GL_ONE_MINUS_CONSTANT_ALPHA:
- return SP_BLENDFACTOR_INV_CONST_ALPHA;
+ return PIPE_BLENDFACTOR_INV_CONST_ALPHA;
/*
- return SP_BLENDFACTOR_INV_SRC1_COLOR;
- return SP_BLENDFACTOR_INV_SRC1_ALPHA;
+ return PIPE_BLENDFACTOR_INV_SRC1_COLOR;
+ return PIPE_BLENDFACTOR_INV_SRC1_ALPHA;
*/
default:
assert("invalid GL token in gl_blend_to_sp()" == NULL);
@@ -105,44 +105,44 @@ gl_blend_to_sp(GLenum blend)
/**
- * Convert GLenum logicop tokens to softpipe tokens.
+ * Convert GLenum logicop tokens to pipe tokens.
*/
static GLuint
gl_logicop_to_sp(GLenum logicop)
{
switch (logicop) {
case GL_CLEAR:
- return SP_LOGICOP_CLEAR;
+ return PIPE_LOGICOP_CLEAR;
case GL_NOR:
- return SP_LOGICOP_NOR;
+ return PIPE_LOGICOP_NOR;
case GL_AND_INVERTED:
- return SP_LOGICOP_AND_INVERTED;
+ return PIPE_LOGICOP_AND_INVERTED;
case GL_COPY_INVERTED:
- return SP_LOGICOP_COPY_INVERTED;
+ return PIPE_LOGICOP_COPY_INVERTED;
case GL_AND_REVERSE:
- return SP_LOGICOP_AND_REVERSE;
+ return PIPE_LOGICOP_AND_REVERSE;
case GL_INVERT:
- return SP_LOGICOP_INVERT;
+ return PIPE_LOGICOP_INVERT;
case GL_XOR:
- return SP_LOGICOP_XOR;
+ return PIPE_LOGICOP_XOR;
case GL_NAND:
- return SP_LOGICOP_NAND;
+ return PIPE_LOGICOP_NAND;
case GL_AND:
- return SP_LOGICOP_AND;
+ return PIPE_LOGICOP_AND;
case GL_EQUIV:
- return SP_LOGICOP_EQUIV;
+ return PIPE_LOGICOP_EQUIV;
case GL_NOOP:
- return SP_LOGICOP_NOOP;
+ return PIPE_LOGICOP_NOOP;
case GL_OR_INVERTED:
- return SP_LOGICOP_OR_INVERTED;
+ return PIPE_LOGICOP_OR_INVERTED;
case GL_COPY:
- return SP_LOGICOP_COPY;
+ return PIPE_LOGICOP_COPY;
case GL_OR_REVERSE:
- return SP_LOGICOP_OR_REVERSE;
+ return PIPE_LOGICOP_OR_REVERSE;
case GL_OR:
- return SP_LOGICOP_OR;
+ return PIPE_LOGICOP_OR;
case GL_SET:
- return SP_LOGICOP_SET;
+ return PIPE_LOGICOP_SET;
default:
assert("invalid GL token in gl_logicop_to_sp()" == NULL);
return 0;
@@ -153,7 +153,7 @@ gl_logicop_to_sp(GLenum logicop)
static void
update_blend( struct st_context *st )
{
- struct softpipe_blend_state blend;
+ struct pipe_blend_state blend;
memset(&blend, 0, sizeof(blend));
@@ -183,7 +183,7 @@ update_blend( struct st_context *st )
if (memcmp(&blend, &st->state.blend, sizeof(blend)) != 0) {
/* state has changed */
st->state.blend = blend; /* struct copy */
- st->softpipe->set_blend_state(st->softpipe, &blend); /* set new state */
+ st->pipe->set_blend_state(st->pipe, &blend); /* set new state */
}
}
diff --git a/src/mesa/state_tracker/st_atom_cbuf.c b/src/mesa/state_tracker/st_atom_cbuf.c
index cd707ec5ef5..0f90aa76463 100644
--- a/src/mesa/state_tracker/st_atom_cbuf.c
+++ b/src/mesa/state_tracker/st_atom_cbuf.c
@@ -31,7 +31,7 @@
*/
#include "st_context.h"
-#include "softpipe/sp_context.h"
+#include "pipe/p_context.h"
#include "st_atom.h"
extern GLboolean xmesa_get_cbuf_details( GLcontext *ctx,
@@ -45,7 +45,7 @@ extern GLboolean xmesa_get_cbuf_details( GLcontext *ctx,
*/
static void update_cbuf_state( struct st_context *st )
{
- struct softpipe_surface cbuf;
+ struct pipe_surface cbuf;
GLboolean ok;
ok = xmesa_get_cbuf_details( st->ctx,
@@ -58,7 +58,7 @@ static void update_cbuf_state( struct st_context *st )
if (memcmp(&cbuf, &st->state.cbuf, sizeof(cbuf)) != 0) {
st->state.cbuf = cbuf;
- st->softpipe->set_cbuf_state( st->softpipe, &cbuf );
+ st->pipe->set_cbuf_state( st->pipe, &cbuf );
}
}
diff --git a/src/mesa/state_tracker/st_atom_clip.c b/src/mesa/state_tracker/st_atom_clip.c
index 710d6ffc84f..8ccad637d5f 100644
--- a/src/mesa/state_tracker/st_atom_clip.c
+++ b/src/mesa/state_tracker/st_atom_clip.c
@@ -32,7 +32,7 @@
#include "st_context.h"
-#include "softpipe/sp_context.h"
+#include "pipe/p_context.h"
#include "st_atom.h"
@@ -40,12 +40,12 @@
*/
static void update_clip( struct st_context *st )
{
- struct softpipe_clip_state clip;
+ struct pipe_clip_state clip;
GLuint i;
memset(&clip, 0, sizeof(clip));
- for (i = 0; i < SP_MAX_CLIP_PLANES; i++) {
+ for (i = 0; i < PIPE_MAX_CLIP_PLANES; i++) {
if (st->ctx->Transform.ClipPlanesEnabled & (1 << i)) {
memcpy(clip.ucp[clip.nr],
st->ctx->Transform._ClipUserPlane[i],
@@ -56,7 +56,7 @@ static void update_clip( struct st_context *st )
if (memcmp(&clip, &st->state.clip, sizeof(clip)) != 0) {
st->state.clip = clip;
- st->softpipe->set_clip_state(st->softpipe, &clip);
+ st->pipe->set_clip_state(st->pipe, &clip);
}
}
diff --git a/src/mesa/state_tracker/st_atom_depth.c b/src/mesa/state_tracker/st_atom_depth.c
index 5532abc8fd7..4c891e6e542 100644
--- a/src/mesa/state_tracker/st_atom_depth.c
+++ b/src/mesa/state_tracker/st_atom_depth.c
@@ -34,25 +34,25 @@
#include "st_context.h"
#include "st_atom.h"
-#include "softpipe/sp_context.h"
-#include "softpipe/sp_defines.h"
+#include "pipe/p_context.h"
+#include "pipe/p_defines.h"
/**
- * Convert GLenum depth func tokens to softpipe tokens.
+ * Convert GLenum depth func tokens to pipe tokens.
*/
static GLuint
gl_depth_func_to_sp(GLenum func)
{
/* Same values, just biased */
- assert(SP_DEPTH_FUNC_NEVER == GL_NEVER - GL_NEVER);
- assert(SP_DEPTH_FUNC_LESS == GL_LESS - GL_NEVER);
- assert(SP_DEPTH_FUNC_EQUAL == GL_EQUAL - GL_NEVER);
- assert(SP_DEPTH_FUNC_LEQUAL == GL_LEQUAL - GL_NEVER);
- assert(SP_DEPTH_FUNC_GREATER == GL_GREATER - GL_NEVER);
- assert(SP_DEPTH_FUNC_NOTEQUAL == GL_NOTEQUAL - GL_NEVER);
- assert(SP_DEPTH_FUNC_GEQUAL == GL_GEQUAL - GL_NEVER);
- assert(SP_DEPTH_FUNC_ALWAYS == GL_ALWAYS - GL_NEVER);
+ assert(PIPE_DEPTH_FUNC_NEVER == GL_NEVER - GL_NEVER);
+ assert(PIPE_DEPTH_FUNC_LESS == GL_LESS - GL_NEVER);
+ assert(PIPE_DEPTH_FUNC_EQUAL == GL_EQUAL - GL_NEVER);
+ assert(PIPE_DEPTH_FUNC_LEQUAL == GL_LEQUAL - GL_NEVER);
+ assert(PIPE_DEPTH_FUNC_GREATER == GL_GREATER - GL_NEVER);
+ assert(PIPE_DEPTH_FUNC_NOTEQUAL == GL_NOTEQUAL - GL_NEVER);
+ assert(PIPE_DEPTH_FUNC_GEQUAL == GL_GEQUAL - GL_NEVER);
+ assert(PIPE_DEPTH_FUNC_ALWAYS == GL_ALWAYS - GL_NEVER);
assert(func >= GL_NEVER);
assert(func <= GL_ALWAYS);
return func - GL_NEVER;
@@ -62,7 +62,7 @@ gl_depth_func_to_sp(GLenum func)
static void
update_depth( struct st_context *st )
{
- struct softpipe_depth_state depth;
+ struct pipe_depth_state depth;
memset(&depth, 0, sizeof(depth));
@@ -74,7 +74,7 @@ update_depth( struct st_context *st )
if (memcmp(&depth, &st->state.depth, sizeof(depth)) != 0) {
/* state has changed */
st->state.depth = depth; /* struct copy */
- st->softpipe->set_depth_state(st->softpipe, &depth); /* set new state */
+ st->pipe->set_depth_state(st->pipe, &depth); /* set new state */
}
}
diff --git a/src/mesa/state_tracker/st_atom_fs.c b/src/mesa/state_tracker/st_atom_fs.c
index ca109d2d343..9c6bc1ce2af 100644
--- a/src/mesa/state_tracker/st_atom_fs.c
+++ b/src/mesa/state_tracker/st_atom_fs.c
@@ -30,19 +30,19 @@
*/
#include "st_context.h"
-#include "softpipe/sp_context.h"
+#include "pipe/p_context.h"
#include "st_atom.h"
static void update_fs( struct st_context *st )
{
- struct softpipe_fs_state fs;
+ struct pipe_fs_state fs;
fs.fp = st->ctx->FragmentProgram._Current;
if (memcmp(&fs, &st->state.fs, sizeof(fs)) != 0) {
st->state.fs = fs;
- st->softpipe->set_fs_state(st->softpipe, &fs);
+ st->pipe->set_fs_state(st->pipe, &fs);
}
}
diff --git a/src/mesa/state_tracker/st_atom_scissor.c b/src/mesa/state_tracker/st_atom_scissor.c
index 105c2a6dd92..75bead388f3 100644
--- a/src/mesa/state_tracker/st_atom_scissor.c
+++ b/src/mesa/state_tracker/st_atom_scissor.c
@@ -32,7 +32,7 @@
#include "st_context.h"
-#include "softpipe/sp_context.h"
+#include "pipe/p_context.h"
#include "st_atom.h"
@@ -42,7 +42,7 @@
static void
update_scissor( struct st_context *st )
{
- struct softpipe_scissor_rect scissor;
+ struct pipe_scissor_rect scissor;
const struct gl_framebuffer *fb = st->ctx->DrawBuffer;
scissor.minx = 0;
@@ -69,7 +69,7 @@ update_scissor( struct st_context *st )
if (memcmp(&scissor, &st->state.scissor, sizeof(scissor)) != 0) {
/* state has changed */
st->state.scissor = scissor; /* struct copy */
- st->softpipe->set_scissor_rect(st->softpipe, &scissor); /* activate */
+ st->pipe->set_scissor_rect(st->pipe, &scissor); /* activate */
}
}
diff --git a/src/mesa/state_tracker/st_atom_setup.c b/src/mesa/state_tracker/st_atom_setup.c
index 2a582ea36ca..d88d403c1dd 100644
--- a/src/mesa/state_tracker/st_atom_setup.c
+++ b/src/mesa/state_tracker/st_atom_setup.c
@@ -32,7 +32,7 @@
#include "st_context.h"
-#include "softpipe/sp_context.h"
+#include "pipe/p_context.h"
#include "st_atom.h"
static GLuint translate_fill( GLenum mode )
@@ -60,7 +60,7 @@ static GLboolean get_offset_flag( GLuint fill_mode,
static void update_setup_state( struct st_context *st )
{
GLcontext *ctx = st->ctx;
- struct softpipe_setup_state setup;
+ struct pipe_setup_state setup;
memset(&setup, 0, sizeof(setup));
@@ -162,7 +162,7 @@ static void update_setup_state( struct st_context *st )
if (memcmp(&setup, &st->state.setup, sizeof(setup)) != 0) {
st->state.setup = setup;
- st->softpipe->set_setup_state( st->softpipe, &setup );
+ st->pipe->set_setup_state( st->pipe, &setup );
}
}
diff --git a/src/mesa/state_tracker/st_atom_stencil.c b/src/mesa/state_tracker/st_atom_stencil.c
index 32610c3d24d..b9f24f49e66 100644
--- a/src/mesa/state_tracker/st_atom_stencil.c
+++ b/src/mesa/state_tracker/st_atom_stencil.c
@@ -34,25 +34,25 @@
#include "st_context.h"
#include "st_atom.h"
-#include "softpipe/sp_context.h"
-#include "softpipe/sp_defines.h"
+#include "pipe/p_context.h"
+#include "pipe/p_defines.h"
/**
- * Convert GLenum stencil func tokens to softpipe tokens.
+ * Convert GLenum stencil func tokens to pipe tokens.
*/
static GLuint
gl_stencil_func_to_sp(GLenum func)
{
/* Same values, just biased */
- assert(SP_STENCIL_FUNC_NEVER == GL_NEVER - GL_NEVER);
- assert(SP_STENCIL_FUNC_LESS == GL_LESS - GL_NEVER);
- assert(SP_STENCIL_FUNC_EQUAL == GL_EQUAL - GL_NEVER);
- assert(SP_STENCIL_FUNC_LEQUAL == GL_LEQUAL - GL_NEVER);
- assert(SP_STENCIL_FUNC_GREATER == GL_GREATER - GL_NEVER);
- assert(SP_STENCIL_FUNC_NOTEQUAL == GL_NOTEQUAL - GL_NEVER);
- assert(SP_STENCIL_FUNC_GEQUAL == GL_GEQUAL - GL_NEVER);
- assert(SP_STENCIL_FUNC_ALWAYS == GL_ALWAYS - GL_NEVER);
+ assert(PIPE_STENCIL_FUNC_NEVER == GL_NEVER - GL_NEVER);
+ assert(PIPE_STENCIL_FUNC_LESS == GL_LESS - GL_NEVER);
+ assert(PIPE_STENCIL_FUNC_EQUAL == GL_EQUAL - GL_NEVER);
+ assert(PIPE_STENCIL_FUNC_LEQUAL == GL_LEQUAL - GL_NEVER);
+ assert(PIPE_STENCIL_FUNC_GREATER == GL_GREATER - GL_NEVER);
+ assert(PIPE_STENCIL_FUNC_NOTEQUAL == GL_NOTEQUAL - GL_NEVER);
+ assert(PIPE_STENCIL_FUNC_GEQUAL == GL_GEQUAL - GL_NEVER);
+ assert(PIPE_STENCIL_FUNC_ALWAYS == GL_ALWAYS - GL_NEVER);
assert(func >= GL_NEVER);
assert(func <= GL_ALWAYS);
return func - GL_NEVER;
@@ -60,28 +60,28 @@ gl_stencil_func_to_sp(GLenum func)
/**
- * Convert GLenum stencil op tokens to softpipe tokens.
+ * Convert GLenum stencil op tokens to pipe tokens.
*/
static GLuint
gl_stencil_op_to_sp(GLenum func)
{
switch (func) {
case GL_KEEP:
- return SP_STENCIL_OP_KEEP;
+ return PIPE_STENCIL_OP_KEEP;
case GL_ZERO:
- return SP_STENCIL_OP_ZERO;
+ return PIPE_STENCIL_OP_ZERO;
case GL_REPLACE:
- return SP_STENCIL_OP_REPLACE;
+ return PIPE_STENCIL_OP_REPLACE;
case GL_INCR:
- return SP_STENCIL_OP_INCR;
+ return PIPE_STENCIL_OP_INCR;
case GL_DECR:
- return SP_STENCIL_OP_DECR;
+ return PIPE_STENCIL_OP_DECR;
case GL_INCR_WRAP:
- return SP_STENCIL_OP_INCR_WRAP;
+ return PIPE_STENCIL_OP_INCR_WRAP;
case GL_DECR_WRAP:
- return SP_STENCIL_OP_DECR_WRAP;
+ return PIPE_STENCIL_OP_DECR_WRAP;
case GL_INVERT:
- return SP_STENCIL_OP_INVERT;
+ return PIPE_STENCIL_OP_INVERT;
default:
assert("invalid GL token in gl_stencil_op_to_sp()" == NULL);
return 0;
@@ -92,7 +92,7 @@ gl_stencil_op_to_sp(GLenum func)
static void
update_stencil( struct st_context *st )
{
- struct softpipe_stencil_state stencil;
+ struct pipe_stencil_state stencil;
memset(&stencil, 0, sizeof(stencil));
@@ -121,7 +121,7 @@ update_stencil( struct st_context *st )
if (memcmp(&stencil, &st->state.stencil, sizeof(stencil)) != 0) {
/* state has changed */
st->state.stencil = stencil; /* struct copy */
- st->softpipe->set_stencil_state(st->softpipe, &stencil); /* set new state */
+ st->pipe->set_stencil_state(st->pipe, &stencil); /* set new state */
}
}
diff --git a/src/mesa/state_tracker/st_atom_viewport.c b/src/mesa/state_tracker/st_atom_viewport.c
index af896e2e31a..765bcf3647e 100644
--- a/src/mesa/state_tracker/st_atom_viewport.c
+++ b/src/mesa/state_tracker/st_atom_viewport.c
@@ -29,7 +29,7 @@
#include "context.h"
#include "colormac.h"
#include "st_context.h"
-#include "softpipe/sp_context.h"
+#include "pipe/p_context.h"
#include "st_atom.h"
@@ -88,7 +88,7 @@ static void update_viewport( struct st_context *st )
GLfloat half_height = ctx->Viewport.Height / 2.0;
GLfloat half_depth = (ctx->Viewport.Far - ctx->Viewport.Near) / 2.0;
- struct softpipe_viewport vp;
+ struct pipe_viewport vp;
vp.scale[0] = half_width;
vp.scale[1] = half_height * yScale;
@@ -102,7 +102,7 @@ static void update_viewport( struct st_context *st )
if (memcmp(&vp, &st->state.viewport, sizeof(vp)) != 0) {
st->state.viewport = vp;
- st->softpipe->set_viewport(st->softpipe, &vp);
+ st->pipe->set_viewport(st->pipe, &vp);
}
}
}
diff --git a/src/mesa/state_tracker/st_context.c b/src/mesa/state_tracker/st_context.c
index 8a06dd88df7..6308e81a619 100644
--- a/src/mesa/state_tracker/st_context.c
+++ b/src/mesa/state_tracker/st_context.c
@@ -31,7 +31,7 @@
#include "st_atom.h"
#include "st_draw.h"
#include "st_program.h"
-#include "softpipe/sp_context.h"
+#include "pipe/p_context.h"
void st_invalidate_state(GLcontext * ctx, GLuint new_state)
{
@@ -43,14 +43,14 @@ void st_invalidate_state(GLcontext * ctx, GLuint new_state)
struct st_context *st_create_context( GLcontext *ctx,
- struct softpipe_context *softpipe )
+ struct pipe_context *pipe )
{
struct st_context *st = CALLOC_STRUCT( st_context );
ctx->st = st;
st->ctx = ctx;
- st->softpipe = softpipe;
+ st->pipe = pipe;
st->dirty.mesa = ~0;
st->dirty.st = ~0;
@@ -68,7 +68,7 @@ void st_destroy_context( struct st_context *st )
st_destroy_atoms( st );
st_destroy_draw( st );
st_destroy_cb_program( st );
- st->softpipe->destroy( st->softpipe );
+ st->pipe->destroy( st->pipe );
FREE( st );
}
diff --git a/src/mesa/state_tracker/st_context.h b/src/mesa/state_tracker/st_context.h
index 317d3773718..6d9460e2f08 100644
--- a/src/mesa/state_tracker/st_context.h
+++ b/src/mesa/state_tracker/st_context.h
@@ -29,7 +29,7 @@
#define ST_CONTEXT_H
#include "mtypes.h"
-#include "softpipe/sp_state.h"
+#include "pipe/p_state.h"
struct st_context;
@@ -58,23 +58,23 @@ struct st_context
{
GLcontext *ctx;
- struct softpipe_context *softpipe;
+ struct pipe_context *pipe;
- /* Eventually will use a cache to feed the softpipe with
+ /* Eventually will use a cache to feed the pipe with
* create/bind/delete calls to constant state objects. Not yet
* though, we just shove random objects across the interface.
*/
struct {
- struct softpipe_viewport viewport;
- struct softpipe_setup_state setup;
- struct softpipe_fs_state fs;
- struct softpipe_blend_state blend;
- struct softpipe_surface cbuf;
- struct softpipe_clip_state clip;
- struct softpipe_depth_state depth;
- struct softpipe_scissor_rect scissor;
- struct softpipe_poly_stipple poly_stipple;
- struct softpipe_stencil_state stencil;
+ struct pipe_viewport viewport;
+ struct pipe_setup_state setup;
+ struct pipe_fs_state fs;
+ struct pipe_blend_state blend;
+ struct pipe_surface cbuf;
+ struct pipe_clip_state clip;
+ struct pipe_depth_state depth;
+ struct pipe_scissor_rect scissor;
+ struct pipe_poly_stipple poly_stipple;
+ struct pipe_stencil_state stencil;
} state;
struct {
diff --git a/src/mesa/state_tracker/st_draw.c b/src/mesa/state_tracker/st_draw.c
index 12646402eec..4db81899885 100644
--- a/src/mesa/state_tracker/st_draw.c
+++ b/src/mesa/state_tracker/st_draw.c
@@ -38,7 +38,7 @@
#include "st_context.h"
#include "st_atom.h"
#include "st_draw.h"
-#include "softpipe/sp_context.h"
+#include "pipe/p_context.h"
/*
* TNL stage which feedsinto the above.
@@ -52,13 +52,13 @@ static GLboolean draw( GLcontext * ctx, struct tnl_pipeline_stage *stage )
struct st_context *st = st_context(ctx);
struct vertex_buffer *VB = &TNL_CONTEXT(ctx)->vb;
- /* Validate driver and softpipe state:
+ /* Validate driver and pipe state:
*/
st_validate_state( st );
/* Call into the new draw code to handle the VB:
*/
- st->softpipe->draw_vb( st->softpipe, VB );
+ st->pipe->draw_vb( st->pipe, VB );
/* Finished
*/
@@ -84,7 +84,7 @@ static const struct tnl_pipeline_stage *intel_pipeline[] = {
&_tnl_texture_transform_stage,
&_tnl_point_attenuation_stage,
&_tnl_vertex_program_stage,
- &st_draw, /* ADD: escape to softpipe */
+ &st_draw, /* ADD: escape to pipe */
0,
};
diff --git a/src/mesa/state_tracker/st_public.h b/src/mesa/state_tracker/st_public.h
index 8241dbd52d1..3191549a2f8 100644
--- a/src/mesa/state_tracker/st_public.h
+++ b/src/mesa/state_tracker/st_public.h
@@ -31,10 +31,10 @@
#include "mtypes.h"
struct st_context;
-struct softpipe_context;
+struct pipe_context;
struct st_context *st_create_context( GLcontext *ctx,
- struct softpipe_context *softpipe);
+ struct pipe_context *pipe);
void st_destroy_context( struct st_context *st );
generated by cgit v1.2.3 (git 2.39.1) at 2024-12-25 04:16:14 +0000