[Mesa-dev] [PATCH 4/5] glcpp: Remove unused gl_api bits.

[Kenneth Graunke]

On 01/18/2014 11:13 AM, Kenneth Graunke wrote:
> On 01/17/2014 09:09 PM, Matt Turner wrote:
>> ---
>>  src/glsl/glcpp/glcpp-parse.y | 1 -
>>  src/glsl/glcpp/glcpp.c       | 1 -
>>  2 files changed, 2 deletions(-)
>>
>> diff --git a/src/glsl/glcpp/glcpp-parse.y b/src/glsl/glcpp/glcpp-parse.y
>> index c774662..427fdec 100644
>> --- a/src/glsl/glcpp/glcpp-parse.y
>> +++ b/src/glsl/glcpp/glcpp-parse.y
>> @@ -30,7 +30,6 @@
>>  
>>  #include "glcpp.h"
>>  #include "main/core.h" /* for struct gl_extensions */
>> -#include "main/mtypes.h" /* for gl_api enum */
>>  
>>  static void
>>  yyerror (YYLTYPE *locp, glcpp_parser_t *parser, const char *error);
>> diff --git a/src/glsl/glcpp/glcpp.c b/src/glsl/glcpp/glcpp.c
>> index 6994d7b..c9c2ff2 100644
>> --- a/src/glsl/glcpp/glcpp.c
>> +++ b/src/glsl/glcpp/glcpp.c
>> @@ -101,7 +101,6 @@ load_text_file(void *ctx, const char *filename)
>>  static void
>>  init_fake_gl_context (struct gl_context *gl_ctx)
>>  {
>> -	gl_ctx->API = API_OPENGL_COMPAT;
>>  	gl_ctx->Const.DisableGLSLLineContinuations = false;
>>  }
> 
> NAK.  This is definitely used.

I apologize for the bad review - please ignore it.  My mail reader
scrambled the order of your patches, putting this before patch 3, where
(presumably) you remove the need for this.

--Ken