summaryrefslogtreecommitdiffstats
path: root/src/mesa
diff options
context:
space:
mode:
authorOliver McFadden <[email protected]>2007-05-09 02:24:59 +0000
committerOliver McFadden <[email protected]>2007-05-09 02:24:59 +0000
commit4960af08ad50a3a6ea039145de2698234c2cc892 (patch)
tree07d322c04bda8af15626febc36db3f71e95b1661 /src/mesa
parentf5b0cafbb11d911949a059688c0dd05e3c5c10b8 (diff)
r300: Renamed vertex_shader.h to r300_vertprog.h
Diffstat (limited to 'src/mesa')
-rw-r--r--src/mesa/drivers/dri/r300/r300_context.h2
-rw-r--r--src/mesa/drivers/dri/r300/r300_vertprog.h (renamed from src/mesa/drivers/dri/r300/vertex_shader.h)6
2 files changed, 3 insertions, 5 deletions
diff --git a/src/mesa/drivers/dri/r300/r300_context.h b/src/mesa/drivers/dri/r300/r300_context.h
index 78e0b1ac9d0..e26d563a47b 100644
--- a/src/mesa/drivers/dri/r300/r300_context.h
+++ b/src/mesa/drivers/dri/r300/r300_context.h
@@ -95,7 +95,7 @@ typedef struct r300_context *r300ContextPtr;
/* We should probably change types within vertex_shader
and pixel_shader structure later on */
#define CARD32 GLuint
-#include "vertex_shader.h"
+#include "r300_vertprog.h"
#include "r300_fragprog.h"
#undef CARD32
diff --git a/src/mesa/drivers/dri/r300/vertex_shader.h b/src/mesa/drivers/dri/r300/r300_vertprog.h
index f8267b7a2f5..55a215a4e84 100644
--- a/src/mesa/drivers/dri/r300/vertex_shader.h
+++ b/src/mesa/drivers/dri/r300/r300_vertprog.h
@@ -1,7 +1,5 @@
-#ifndef __VERTEX_SHADER_H__
-#define __VERTEX_SHADER_H__
-
-#include "r300_reg.h"
+#ifndef __R300_VERTPROG_H_
+#define __R300_VERTPROG_H_
typedef struct {
CARD32 op;