diff options
| author | Marek Olšák <maraeo@gmail.com> | 2013-05-14 17:58:32 +0200 |
|---|---|---|
| committer | Marek Olšák <maraeo@gmail.com> | 2013-05-28 13:05:30 +0200 |
| commit | 15a4b6db2192b0adc05c3dc07cf043316c556f2e (patch) | |
| tree | 33681024f6e8dd67bf32a703781ea3fd3f3f854f /src/mesa/main/config.h | |
| parent | cdad129f9cda038fb29cde94645d2fcab7207c50 (diff) | |
mesa: declare UniformBufferBindings as an array with a static size
Some Gallium drivers were crashing, because the array was not large enough.
v2: clamp the per-shader maximum in st/mesa, then sum them all up
NOTE: This is a candidate for the stable branches.
Diffstat (limited to 'src/mesa/main/config.h')
| -rw-r--r-- | src/mesa/main/config.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/src/mesa/main/config.h b/src/mesa/main/config.h index ea87b754a40..4a4fdc98c1d 100644 --- a/src/mesa/main/config.h +++ b/src/mesa/main/config.h @@ -168,6 +168,9 @@ /*@{*/ #define MAX_PROGRAM_LOCAL_PARAMS 4096 #define MAX_UNIFORMS 4096 +#define MAX_UNIFORM_BUFFERS 15 /* + 1 default uniform buffer */ +/* 6 is for vertex, hull, domain, geometry, fragment, and compute shader. */ +#define MAX_COMBINED_UNIFORM_BUFFERS (MAX_UNIFORM_BUFFERS * 6) /*@}*/ /** |