From ec2b92f98c2e7f161521b447cc1d9a36bce3707c Mon Sep 17 00:00:00 2001 From: Brian Paul Date: Thu, 10 Jun 2010 23:02:41 -0600 Subject: mesa: rename src/mesa/shader/ to src/mesa/program/ --- src/mesa/main/arbprogram.c | 8 ++++---- src/mesa/main/context.c | 4 ++-- src/mesa/main/ffvertex_prog.c | 12 ++++++------ src/mesa/main/get.c | 2 +- src/mesa/main/nvprogram.c | 12 ++++++------ src/mesa/main/shaderapi.c | 6 +++--- src/mesa/main/shaderobj.c | 6 +++--- src/mesa/main/shared.c | 2 +- src/mesa/main/state.c | 4 ++-- src/mesa/main/texenvprogram.c | 14 +++++++------- src/mesa/main/texobj.c | 2 +- src/mesa/main/texparam.c | 2 +- src/mesa/main/texstate.c | 2 +- src/mesa/main/transformfeedback.c | 4 ++-- src/mesa/main/uniforms.c | 6 +++--- 15 files changed, 43 insertions(+), 43 deletions(-) (limited to 'src/mesa/main') diff --git a/src/mesa/main/arbprogram.c b/src/mesa/main/arbprogram.c index b6577b81fb..26d781954e 100644 --- a/src/mesa/main/arbprogram.c +++ b/src/mesa/main/arbprogram.c @@ -36,10 +36,10 @@ #include "main/macros.h" #include "main/mtypes.h" #include "main/arbprogram.h" -#include "shader/arbprogparse.h" -#include "shader/nvfragparse.h" -#include "shader/nvvertparse.h" -#include "shader/program.h" +#include "program/arbprogparse.h" +#include "program/nvfragparse.h" +#include "program/nvvertparse.h" +#include "program/program.h" diff --git a/src/mesa/main/context.c b/src/mesa/main/context.c index 5b79e68769..0afd77d375 100644 --- a/src/mesa/main/context.c +++ b/src/mesa/main/context.c @@ -130,8 +130,8 @@ #include "version.h" #include "viewport.h" #include "vtxfmt.h" -#include "shader/program.h" -#include "shader/prog_print.h" +#include "program/program.h" +#include "program/prog_print.h" #if _HAVE_FULL_GL #include "math/m_matrix.h" #endif diff --git a/src/mesa/main/ffvertex_prog.c b/src/mesa/main/ffvertex_prog.c index 70ac47f36d..92fec09bad 100644 --- a/src/mesa/main/ffvertex_prog.c +++ b/src/mesa/main/ffvertex_prog.c @@ -38,12 +38,12 @@ #include "main/macros.h" #include "main/enums.h" #include "main/ffvertex_prog.h" -#include "shader/program.h" -#include "shader/prog_cache.h" -#include "shader/prog_instruction.h" -#include "shader/prog_parameter.h" -#include "shader/prog_print.h" -#include "shader/prog_statevars.h" +#include "program/program.h" +#include "program/prog_cache.h" +#include "program/prog_instruction.h" +#include "program/prog_parameter.h" +#include "program/prog_print.h" +#include "program/prog_statevars.h" /** Max of number of lights and texture coord units */ diff --git a/src/mesa/main/get.c b/src/mesa/main/get.c index 03f2707f4f..c121957aea 100644 --- a/src/mesa/main/get.c +++ b/src/mesa/main/get.c @@ -667,7 +667,7 @@ static const struct value_desc values[] = { { GL_MAX_3D_TEXTURE_SIZE, LOC_CUSTOM, TYPE_INT, offsetof(GLcontext, Const.Max3DTextureLevels), NO_EXTRA }, - /* GL_ARB_fragment_shader/OES_standard_derivatives */ + /* GL_ARB_fragment_program/OES_standard_derivatives */ { GL_FRAGMENT_SHADER_DERIVATIVE_HINT_ARB, CONTEXT_ENUM(Hint.FragmentShaderDerivative), extra_ARB_fragment_shader }, #endif /* FEATURE_GL || FEATURE_ES2 */ diff --git a/src/mesa/main/nvprogram.c b/src/mesa/main/nvprogram.c index 7781648f4b..100ff2c4ab 100644 --- a/src/mesa/main/nvprogram.c +++ b/src/mesa/main/nvprogram.c @@ -43,12 +43,12 @@ #include "main/imports.h" #include "main/macros.h" #include "main/nvprogram.h" -#include "shader/arbprogparse.h" -#include "shader/nvfragparse.h" -#include "shader/nvvertparse.h" -#include "shader/program.h" -#include "shader/prog_instruction.h" -#include "shader/prog_parameter.h" +#include "program/arbprogparse.h" +#include "program/nvfragparse.h" +#include "program/nvvertparse.h" +#include "program/program.h" +#include "program/prog_instruction.h" +#include "program/prog_parameter.h" diff --git a/src/mesa/main/shaderapi.c b/src/mesa/main/shaderapi.c index 81c3964f93..0bd44154f2 100644 --- a/src/mesa/main/shaderapi.c +++ b/src/mesa/main/shaderapi.c @@ -42,9 +42,9 @@ #include "main/hash.h" #include "main/shaderapi.h" #include "main/shaderobj.h" -#include "shader/program.h" -#include "shader/prog_parameter.h" -#include "shader/prog_uniform.h" +#include "program/program.h" +#include "program/prog_parameter.h" +#include "program/prog_uniform.h" #include "slang/slang_compile.h" #include "slang/slang_link.h" diff --git a/src/mesa/main/shaderobj.c b/src/mesa/main/shaderobj.c index 01ed3c5c46..d4d2349d4b 100644 --- a/src/mesa/main/shaderobj.c +++ b/src/mesa/main/shaderobj.c @@ -34,9 +34,9 @@ #include "main/dispatch.h" #include "main/hash.h" #include "main/shaderobj.h" -#include "shader/program.h" -#include "shader/prog_parameter.h" -#include "shader/prog_uniform.h" +#include "program/program.h" +#include "program/prog_parameter.h" +#include "program/prog_uniform.h" /**********************************************************************/ diff --git a/src/mesa/main/shared.c b/src/mesa/main/shared.c index a44d2d51c4..f9d10f3bbe 100644 --- a/src/mesa/main/shared.c +++ b/src/mesa/main/shared.c @@ -38,7 +38,7 @@ #endif #include "bufferobj.h" #include "shared.h" -#include "shader/program.h" +#include "program/program.h" #include "dlist.h" #include "shaderobj.h" #if FEATURE_ARB_sync diff --git a/src/mesa/main/state.c b/src/mesa/main/state.c index b971cc976e..2239ea4a85 100644 --- a/src/mesa/main/state.c +++ b/src/mesa/main/state.c @@ -41,8 +41,8 @@ #include "light.h" #include "matrix.h" #include "pixel.h" -#include "shader/program.h" -#include "shader/prog_parameter.h" +#include "program/program.h" +#include "program/prog_parameter.h" #include "state.h" #include "stencil.h" #include "texenvprogram.h" diff --git a/src/mesa/main/texenvprogram.c b/src/mesa/main/texenvprogram.c index 964ba13c70..30963bdf7d 100644 --- a/src/mesa/main/texenvprogram.c +++ b/src/mesa/main/texenvprogram.c @@ -28,13 +28,13 @@ #include "glheader.h" #include "imports.h" -#include "shader/program.h" -#include "shader/prog_parameter.h" -#include "shader/prog_cache.h" -#include "shader/prog_instruction.h" -#include "shader/prog_print.h" -#include "shader/prog_statevars.h" -#include "shader/programopt.h" +#include "program/program.h" +#include "program/prog_parameter.h" +#include "program/prog_cache.h" +#include "program/prog_instruction.h" +#include "program/prog_print.h" +#include "program/prog_statevars.h" +#include "program/programopt.h" #include "texenvprogram.h" diff --git a/src/mesa/main/texobj.c b/src/mesa/main/texobj.c index de37e34039..1df165cf6a 100644 --- a/src/mesa/main/texobj.c +++ b/src/mesa/main/texobj.c @@ -40,7 +40,7 @@ #include "teximage.h" #include "texobj.h" #include "mtypes.h" -#include "shader/prog_instruction.h" +#include "program/prog_instruction.h" diff --git a/src/mesa/main/texparam.c b/src/mesa/main/texparam.c index ca03404f12..745a0aeec9 100644 --- a/src/mesa/main/texparam.c +++ b/src/mesa/main/texparam.c @@ -39,7 +39,7 @@ #include "main/texparam.h" #include "main/teximage.h" #include "main/texstate.h" -#include "shader/prog_instruction.h" +#include "program/prog_instruction.h" /** diff --git a/src/mesa/main/texstate.c b/src/mesa/main/texstate.c index fce17c2b66..dae173d1bd 100644 --- a/src/mesa/main/texstate.c +++ b/src/mesa/main/texstate.c @@ -528,7 +528,7 @@ update_texture_state( GLcontext *ctx ) /* Get the bitmask of texture target enables. * enableBits will be a mask of the TEXTURE_*_BIT flags indicating * which texture targets are enabled (fixed function) or referenced - * by a fragment shader/program. When multiple flags are set, we'll + * by a fragment program/program. When multiple flags are set, we'll * settle on the one with highest priority (see below). */ if (vprog) { diff --git a/src/mesa/main/transformfeedback.c b/src/mesa/main/transformfeedback.c index 68a14d47c8..6126f1286d 100644 --- a/src/mesa/main/transformfeedback.c +++ b/src/mesa/main/transformfeedback.c @@ -39,8 +39,8 @@ #include "shaderobj.h" #include "main/dispatch.h" -#include "shader/prog_parameter.h" -//#include "shader/shader_api.h" +#include "program/prog_parameter.h" +//#include "program/shader_api.h" #if FEATURE_EXT_transform_feedback diff --git a/src/mesa/main/uniforms.c b/src/mesa/main/uniforms.c index 6452980e9c..aac4177f40 100644 --- a/src/mesa/main/uniforms.c +++ b/src/mesa/main/uniforms.c @@ -41,9 +41,9 @@ #include "main/shaderapi.h" #include "main/shaderobj.h" #include "main/uniforms.h" -#include "shader/prog_parameter.h" -#include "shader/prog_statevars.h" -#include "shader/prog_uniform.h" +#include "program/prog_parameter.h" +#include "program/prog_statevars.h" +#include "program/prog_uniform.h" -- cgit v1.2.3