summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorEric Anholt <[email protected]>2005-05-31 04:26:13 +0000
committerEric Anholt <[email protected]>2005-05-31 04:26:13 +0000
commitef377c3c007611e57aef176cb66d8b4c18f1a6c3 (patch)
tree0e723fc4d78f158adbc768a22fa06bd3ea7a33e2 /src
parentb79c47e90ce421426e4608c85461148f3962f9a0 (diff)
Correct the descriptions of the glBlend{Equation,Func} fallbacks in r128, and
remove those descriptions and the corresponding bits on r200, where they're no longer used.
Diffstat (limited to 'src')
-rw-r--r--src/mesa/drivers/dri/r128/r128_tris.c4
-rw-r--r--src/mesa/drivers/dri/r200/r200_context.h14
-rw-r--r--src/mesa/drivers/dri/r200/r200_swtcl.c2
3 files changed, 8 insertions, 12 deletions
diff --git a/src/mesa/drivers/dri/r128/r128_tris.c b/src/mesa/drivers/dri/r128/r128_tris.c
index 8c2047baa4b..4a1015b9e4c 100644
--- a/src/mesa/drivers/dri/r128/r128_tris.c
+++ b/src/mesa/drivers/dri/r128/r128_tris.c
@@ -673,8 +673,8 @@ static const char * const fallbackStrings[] = {
"glRenderMode(selection or feedback)",
"glLogicOp (mode != GL_COPY)",
"GL_SEPARATE_SPECULAR_COLOR",
- "glBlendEquation",
- "glBlendFunc(mode != ADD)",
+ "glBlendEquation(mode != ADD)",
+ "glBlendFunc",
"Projective texture",
"Rasterization disable",
};
diff --git a/src/mesa/drivers/dri/r200/r200_context.h b/src/mesa/drivers/dri/r200/r200_context.h
index eea3a7fe358..5e3fb2295d5 100644
--- a/src/mesa/drivers/dri/r200/r200_context.h
+++ b/src/mesa/drivers/dri/r200/r200_context.h
@@ -59,14 +59,12 @@ typedef struct r200_context *r200ContextPtr;
/* Flags for software fallback cases */
/* See correponding strings in r200_swtcl.c */
-#define R200_FALLBACK_TEXTURE 0x1
-#define R200_FALLBACK_DRAW_BUFFER 0x2
-#define R200_FALLBACK_STENCIL 0x4
-#define R200_FALLBACK_RENDER_MODE 0x8
-#define R200_FALLBACK_BLEND_EQ 0x10
-#define R200_FALLBACK_BLEND_FUNC 0x20
-#define R200_FALLBACK_DISABLE 0x40
-#define R200_FALLBACK_BORDER_MODE 0x80
+#define R200_FALLBACK_TEXTURE 0x01
+#define R200_FALLBACK_DRAW_BUFFER 0x02
+#define R200_FALLBACK_STENCIL 0x04
+#define R200_FALLBACK_RENDER_MODE 0x08
+#define R200_FALLBACK_DISABLE 0x10
+#define R200_FALLBACK_BORDER_MODE 0x20
/* The blit width for texture uploads
*/
diff --git a/src/mesa/drivers/dri/r200/r200_swtcl.c b/src/mesa/drivers/dri/r200/r200_swtcl.c
index 4dad6c1271b..fd1aa783f59 100644
--- a/src/mesa/drivers/dri/r200/r200_swtcl.c
+++ b/src/mesa/drivers/dri/r200/r200_swtcl.c
@@ -647,8 +647,6 @@ static const char * const fallbackStrings[] = {
"glDrawBuffer(GL_FRONT_AND_BACK)",
"glEnable(GL_STENCIL) without hw stencil buffer",
"glRenderMode(selection or feedback)",
- "glBlendEquation",
- "glBlendFunc(mode != ADD)",
"R200_NO_RAST",
"Mixing GL_CLAMP_TO_BORDER and GL_CLAMP (or GL_MIRROR_CLAMP_ATI)"
};