Mesa (arb_geometry_shader4): gs: fix result max for geometry shaders

Zack Rusin zack at kemper.freedesktop.org
Tue Jul 28 04:32:09 UTC 2009


Module: Mesa
Branch: arb_geometry_shader4
Commit: ebcf24070210690d085ca07cd7db58c2fd47944e
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=ebcf24070210690d085ca07cd7db58c2fd47944e

Author: Zack Rusin <zackr at vmware.com>
Date:   Tue Jul 28 00:36:13 2009 -0400

gs: fix result max for geometry shaders

we were wrapping around on those due to which num_outputs was always
bigger than it really was

---

 src/mesa/main/mtypes.h |    5 +++--
 1 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/mesa/main/mtypes.h b/src/mesa/main/mtypes.h
index d8ac739..cb2a739 100644
--- a/src/mesa/main/mtypes.h
+++ b/src/mesa/main/mtypes.h
@@ -284,8 +284,9 @@ typedef enum {
    GEOM_RESULT_CLPV = 15,
    GEOM_RESULT_PRID = 16,
    GEOM_RESULT_LAYR = 17,
-   GEOM_RESULT_VAR0 = 18,  /**< shader varying */
-   GEOM_RESULT_MAX  =  (GEOM_RESULT_VAR0 + MAX_VARYING)
+   GEOM_RESULT_VAR0 = 18,  /**< shader varying, should really be 16 */
+   /* ### we need to -2 because var0 is 18 instead 16 like in the others */
+   GEOM_RESULT_MAX  =  (GEOM_RESULT_VAR0 + MAX_VARYING - 2)
 } gl_geom_result;
 /*@}*/
 




More information about the mesa-commit mailing list