diff options
| author | marha <marha@users.sourceforge.net> | 2013-10-02 11:08:18 +0200 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2013-10-02 11:08:18 +0200 |
| commit | 8092f320c341a6b3a1b428fdd4473859d5db8b79 (patch) | |
| tree | 88b2bd0c519042f9b8d98dc36f63ff167338d635 /mesalib/src/mesa/state_tracker | |
| parent | 6dd755aa923291db2501cc5c22e409c41a70e3c1 (diff) | |
| download | vcxsrv-8092f320c341a6b3a1b428fdd4473859d5db8b79.tar.gz vcxsrv-8092f320c341a6b3a1b428fdd4473859d5db8b79.tar.bz2 vcxsrv-8092f320c341a6b3a1b428fdd4473859d5db8b79.zip | |
fontconfig mesa pixman xkeyboard-config git update 2 Okt 2013
xkeyboard-config commit e5a53229a9914235921911f05b31d6092e844ea1
pixman commit 7d05a7f4dc825f9c778e534fdabb749199c2e439
fontconfig commit 0203055520206028eecee5d261887cdc91500e15
mesa commit 848c0e72f36d0e1e460193a2d30b2f631529156f
Diffstat (limited to 'mesalib/src/mesa/state_tracker')
| -rw-r--r-- | mesalib/src/mesa/state_tracker/st_glsl_to_tgsi.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/mesalib/src/mesa/state_tracker/st_glsl_to_tgsi.cpp b/mesalib/src/mesa/state_tracker/st_glsl_to_tgsi.cpp index 53838b391..a5d0b84e3 100644 --- a/mesalib/src/mesa/state_tracker/st_glsl_to_tgsi.cpp +++ b/mesalib/src/mesa/state_tracker/st_glsl_to_tgsi.cpp @@ -43,11 +43,11 @@ #include "main/mtypes.h" #include "main/shaderobj.h" +#include "main/uniforms.h" #include "program/hash_table.h" extern "C" { #include "main/shaderapi.h" -#include "main/uniforms.h" #include "program/prog_instruction.h" #include "program/prog_optimize.h" #include "program/prog_print.h" @@ -217,7 +217,7 @@ st_dst_reg::st_dst_reg(st_src_reg reg) class glsl_to_tgsi_instruction : public exec_node { public: - DECLARE_RZALLOC_CXX_OPERATORS(glsl_to_tgsi_instruction) + DECLARE_RALLOC_CXX_OPERATORS(glsl_to_tgsi_instruction) unsigned op; st_dst_reg dst; |