diff options
Diffstat (limited to 'src/glsl/pp/sl_pp_extension.c')
-rw-r--r-- | src/glsl/pp/sl_pp_extension.c | 25 |
1 files changed, 1 insertions, 24 deletions
diff --git a/src/glsl/pp/sl_pp_extension.c b/src/glsl/pp/sl_pp_extension.c index 1f00d94eba..d119677c26 100644 --- a/src/glsl/pp/sl_pp_extension.c +++ b/src/glsl/pp/sl_pp_extension.c @@ -53,8 +53,6 @@ sl_pp_context_add_extension(struct sl_pp_context *context, return -1; } - ext.enabled = 0; - context->extensions[context->num_extensions++] = ext; assert(context->num_extensions <= sizeof(context->extensions)); @@ -62,6 +60,7 @@ sl_pp_context_add_extension(struct sl_pp_context *context, return 0; } + /** * Process a "#extension name: behavior" directive. */ @@ -75,7 +74,6 @@ sl_pp_process_extension(struct sl_pp_context *context, int extension_name = -1; int behavior = -1; struct sl_pp_token_info out; - struct sl_pp_extension *extension = NULL; /* Grab the extension name. */ if (first < last && input[first].token == SL_PP_IDENTIFIER) { @@ -97,7 +95,6 @@ sl_pp_process_extension(struct sl_pp_context *context, for (i = 0; i < context->num_extensions; i++) { if (extension_name == context->extensions[i].name) { out.data.extension = extension_name; - extension = &context->extensions[i]; break; } } @@ -137,11 +134,6 @@ sl_pp_process_extension(struct sl_pp_context *context, return -1; } out.token = SL_PP_EXTENSION_REQUIRE; - - if (extension_name != context->dict.all) { - assert(extension); - extension->enabled = 1; - } } else if (behavior == context->dict.enable) { if (out.data.extension == -1) { /* Warning: the extension cannot be enabled. */ @@ -152,33 +144,18 @@ sl_pp_process_extension(struct sl_pp_context *context, return -1; } out.token = SL_PP_EXTENSION_ENABLE; - - if (extension_name != context->dict.all) { - assert(extension); - extension->enabled = 1; - } } else if (behavior == context->dict.warn) { if (out.data.extension == -1) { /* Warning: the extension is not supported. */ return 0; } out.token = SL_PP_EXTENSION_WARN; - - if (extension_name != context->dict.all) { - assert(extension); - extension->enabled = 1; - } } else if (behavior == context->dict.disable) { if (out.data.extension == -1) { /* Warning: the extension is not supported. */ return 0; } out.token = SL_PP_EXTENSION_DISABLE; - - if (extension_name != context->dict.all) { - assert(extension); - extension->enabled = 0; - } } else { strcpy(context->error_msg, "unrecognised behavior name"); return -1; |