Mesa (master): gallium: geometry shader can be always enabled and we don' t need a cap for that

Zack Rusin zack at kemper.freedesktop.org
Fri Dec 25 02:55:47 PST 2009


Module: Mesa
Branch: master
Commit: 519a6d308d201a5ccedecf87344fd7542e90bb0f
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=519a6d308d201a5ccedecf87344fd7542e90bb0f

Author: Zack Rusin <zackr at vmware.com>
Date:   Thu Dec 24 09:30:00 2009 -0500

gallium: geometry shader can be always enabled and we don't need a cap for that

using the draw module allows us to enable geometry shading even on hardware
that doesn't support it.

---

 src/gallium/drivers/softpipe/sp_screen.c |    2 --
 src/gallium/include/pipe/p_defines.h     |    1 -
 2 files changed, 0 insertions(+), 3 deletions(-)

diff --git a/src/gallium/drivers/softpipe/sp_screen.c b/src/gallium/drivers/softpipe/sp_screen.c
index a32312d..bd3532d 100644
--- a/src/gallium/drivers/softpipe/sp_screen.c
+++ b/src/gallium/drivers/softpipe/sp_screen.c
@@ -89,8 +89,6 @@ softpipe_get_param(struct pipe_screen *screen, int param)
       return 13; /* max 4Kx4K */
    case PIPE_CAP_TGSI_CONT_SUPPORTED:
       return 1;
-   case PIPE_CAP_GEOMETRY_SHADER4:
-      return 1;
    case PIPE_CAP_BLEND_EQUATION_SEPARATE:
       return 1;
    default:
diff --git a/src/gallium/include/pipe/p_defines.h b/src/gallium/include/pipe/p_defines.h
index 90fc333..2cda408 100644
--- a/src/gallium/include/pipe/p_defines.h
+++ b/src/gallium/include/pipe/p_defines.h
@@ -398,7 +398,6 @@ enum pipe_transfer_usage {
 #define PIPE_CAP_MAX_PREDICATE_REGISTERS 30
 #define PIPE_CAP_MAX_COMBINED_SAMPLERS   31  /*< Maximum texture image units accessible from vertex
                                                  and fragment shaders combined */
-#define PIPE_CAP_GEOMETRY_SHADER4        32
 
 
 /**



More information about the mesa-commit mailing list