From 4960af08ad50a3a6ea039145de2698234c2cc892 Mon Sep 17 00:00:00 2001 From: Oliver McFadden Date: Wed, 9 May 2007 02:24:59 +0000 Subject: [PATCH] r300: Renamed vertex_shader.h to r300_vertprog.h --- src/mesa/drivers/dri/r300/r300_context.h | 2 +- .../drivers/dri/r300/{vertex_shader.h => r300_vertprog.h} | 6 ++---- 2 files changed, 3 insertions(+), 5 deletions(-) rename src/mesa/drivers/dri/r300/{vertex_shader.h => r300_vertprog.h} (97%) 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 similarity index 97% rename from src/mesa/drivers/dri/r300/vertex_shader.h rename to 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; -- 2.30.2