diff options
| author | Brian <[email protected]> | 2006-12-15 08:50:02 -0700 |
|---|---|---|
| committer | Brian <[email protected]> | 2006-12-15 08:50:02 -0700 |
| commit | c968d3d410a1897ecbb41d3557adaef69a4c627a (patch) | |
| tree | 12a6ce19efc3da5e110f3f090d26d884fef39bce /src/mesa/swrast | |
| parent | b78fb7abaff4e1b1e55d7f2c137ac9a1d40137f2 (diff) | |
Renamed s_nvfragprog.[ch] to s_fragprog.[ch]
Diffstat (limited to 'src/mesa/swrast')
| -rw-r--r-- | src/mesa/swrast/s_fragprog.c | 11 | ||||
| -rw-r--r-- | src/mesa/swrast/s_fragprog.h | 13 | ||||
| -rw-r--r-- | src/mesa/swrast/s_span.c | 2 |
3 files changed, 9 insertions, 17 deletions
diff --git a/src/mesa/swrast/s_fragprog.c b/src/mesa/swrast/s_fragprog.c index ac2f5d93b6c..d4985fa2d8c 100644 --- a/src/mesa/swrast/s_fragprog.c +++ b/src/mesa/swrast/s_fragprog.c @@ -22,15 +22,6 @@ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ -/* - * Regarding GL_NV_fragment_program: - * - * Portions of this software may use or implement intellectual - * property owned and licensed by NVIDIA Corporation. NVIDIA disclaims - * any and all warranties with respect to such intellectual property, - * including any use thereof or modifications thereto. - */ - #include "glheader.h" #include "colormac.h" #include "context.h" @@ -39,7 +30,7 @@ #include "prog_print.h" #include "program.h" -#include "s_nvfragprog.h" +#include "s_fragprog.h" #include "s_span.h" diff --git a/src/mesa/swrast/s_fragprog.h b/src/mesa/swrast/s_fragprog.h index 188bacc3d89..e1b7e679185 100644 --- a/src/mesa/swrast/s_fragprog.h +++ b/src/mesa/swrast/s_fragprog.h @@ -1,8 +1,8 @@ /* * Mesa 3-D graphics library - * Version: 6.1 + * Version: 6.5.3 * - * Copyright (C) 1999-2003 Brian Paul All Rights Reserved. + * Copyright (C) 1999-2006 Brian Paul All Rights Reserved. * * Permission is hereby granted, free of charge, to any person obtaining a * copy of this software and associated documentation files (the "Software"), @@ -23,15 +23,16 @@ */ -#ifndef S_NVFRAGPROG_H -#define S_NVFRAGPROG_H +#ifndef S_FRAGPROG_H +#define S_FRAGPROG_H #include "s_context.h" extern void -_swrast_exec_fragment_program( GLcontext *ctx, SWspan *span ); +_swrast_exec_fragment_program(GLcontext *ctx, SWspan *span); -#endif +#endif /* S_FRAGPROG_H */ + diff --git a/src/mesa/swrast/s_span.c b/src/mesa/swrast/s_span.c index e4904e1dd2c..f0918878388 100644 --- a/src/mesa/swrast/s_span.c +++ b/src/mesa/swrast/s_span.c @@ -45,7 +45,7 @@ #include "s_fog.h" #include "s_logic.h" #include "s_masking.h" -#include "s_nvfragprog.h" +#include "s_fragprog.h" #include "s_span.h" #include "s_stencil.h" #include "s_texcombine.h" |