[Mesa-dev] [PATCH 12/14] mesa: remove gl_shader_compiler_options::EmitNoFunctions

Marek Olšák maraeo at gmail.com
Mon Oct 17 13:39:24 UTC 2016


From: Marek Olšák <marek.olsak at amd.com>

---
 src/mesa/main/mtypes.h                 | 1 -
 src/mesa/state_tracker/st_extensions.c | 1 -
 2 files changed, 2 deletions(-)

diff --git a/src/mesa/main/mtypes.h b/src/mesa/main/mtypes.h
index ff20226..5368440 100644
--- a/src/mesa/main/mtypes.h
+++ b/src/mesa/main/mtypes.h
@@ -2989,21 +2989,20 @@ struct gl_pipeline_shader_state
    struct _mesa_HashTable *Objects;
 };
 
 /**
  * Compiler options for a single GLSL shaders type
  */
 struct gl_shader_compiler_options
 {
    /** Driver-selectable options: */
    GLboolean EmitNoLoops;
-   GLboolean EmitNoFunctions;
    GLboolean EmitNoCont;                  /**< Emit CONT opcode? */
    GLboolean EmitNoMainReturn;            /**< Emit CONT/RET opcodes? */
    GLboolean EmitNoNoise;                 /**< Emit NOISE opcodes? */
    GLboolean EmitNoPow;                   /**< Emit POW opcodes? */
    GLboolean EmitNoSat;                   /**< Emit SAT opcodes? */
    GLboolean LowerCombinedClipCullDistance; /** Lower gl_ClipDistance and
                                               * gl_CullDistance together from
                                               * float[8] to vec4[2]
                                               **/
 
diff --git a/src/mesa/state_tracker/st_extensions.c b/src/mesa/state_tracker/st_extensions.c
index 13b7ae4..ebb5d0a 100644
--- a/src/mesa/state_tracker/st_extensions.c
+++ b/src/mesa/state_tracker/st_extensions.c
@@ -265,21 +265,20 @@ void st_init_limits(struct pipe_screen *screen,
 
       options->EmitNoNoise = TRUE;
 
       /* TODO: make these more fine-grained if anyone needs it */
       options->MaxIfDepth =
          screen->get_shader_param(screen, sh,
                                   PIPE_SHADER_CAP_MAX_CONTROL_FLOW_DEPTH);
       options->EmitNoLoops =
          !screen->get_shader_param(screen, sh,
                                    PIPE_SHADER_CAP_MAX_CONTROL_FLOW_DEPTH);
-      options->EmitNoFunctions = true;
       options->EmitNoMainReturn = true;
 
       options->EmitNoCont =
          !screen->get_shader_param(screen, sh,
                                    PIPE_SHADER_CAP_TGSI_CONT_SUPPORTED);
 
       options->EmitNoIndirectInput =
          !screen->get_shader_param(screen, sh,
                                    PIPE_SHADER_CAP_INDIRECT_INPUT_ADDR);
       options->EmitNoIndirectOutput =
-- 
2.7.4



More information about the mesa-dev mailing list