diff options
| author | Marek Olšák <maraeo@gmail.com> | 2013-05-02 01:22:48 +0200 |
|---|---|---|
| committer | Marek Olšák <maraeo@gmail.com> | 2013-05-11 23:44:55 +0200 |
| commit | d27d29f1a67babd93091d34aae4c2784a8d62f31 (patch) | |
| tree | 06a98060fafaffe914009be4b7a3508268e7e0ad /src/mesa/main/config.h | |
| parent | 5471e3949cb6482f1a6dcb969332f2544a758e46 (diff) | |
mesa: consolidate definitions of max texture image units
Shaders are unified on most hardware (= same limits in all stages).
Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
Reviewed-by: Brian Paul <brianp@vmware.com>
Diffstat (limited to 'src/mesa/main/config.h')
| -rw-r--r-- | src/mesa/main/config.h | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/src/mesa/main/config.h b/src/mesa/main/config.h index 33b5ab057d9..76863bf75b4 100644 --- a/src/mesa/main/config.h +++ b/src/mesa/main/config.h @@ -219,9 +219,8 @@ /** For GL_ARB_vertex_shader */ /*@{*/ #define MAX_VERTEX_GENERIC_ATTRIBS 16 -#define MAX_VERTEX_TEXTURE_IMAGE_UNITS MAX_TEXTURE_IMAGE_UNITS -#define MAX_COMBINED_TEXTURE_IMAGE_UNITS (MAX_VERTEX_TEXTURE_IMAGE_UNITS + \ - MAX_TEXTURE_IMAGE_UNITS) +/* 6 is for vertex, hull, domain, geometry, fragment, and compute shader. */ +#define MAX_COMBINED_TEXTURE_IMAGE_UNITS (MAX_TEXTURE_IMAGE_UNITS * 6) /*@}*/ @@ -246,7 +245,6 @@ /** For GL_ARB_geometry_shader4 */ /*@{*/ -#define MAX_GEOMETRY_TEXTURE_IMAGE_UNITS 8 #define MAX_GEOMETRY_VARYING_COMPONENTS 32 #define MAX_VERTEX_VARYING_COMPONENTS 32 #define MAX_GEOMETRY_UNIFORM_COMPONENTS 512 |