OpenHarmony/third_party_mesa3d
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

mesa: don't check for GLSL 1.2 to advertise GL 2.1

Browse Source 
The GLSL 1.2 features are minor...
This commit is contained in:
Brian Paul
2008-08-26 16:13:39 -06:00
parent 9aeb6e7825
commit bafefccff8
2 changed files with 7 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/mesa/main/extensions.c
View File

@@ -1,8 +1,8 @@
/* /*
* Mesa 3-D graphics library * Mesa 3-D graphics library
* Version: 6.5.1 * Version: 7.1
* *
* Copyright (C) 1999-2006 Brian Paul All Rights Reserved. * Copyright (C) 1999-2008 Brian Paul All Rights Reserved.
* *
* Permission is hereby granted, free of charge, to any person obtaining a * Permission is hereby granted, free of charge, to any person obtaining a
* copy of this software and associated documentation files (the "Software"), * copy of this software and associated documentation files (the "Software"),

14
src/mesa/main/getstring.c
View File

@@ -85,7 +85,7 @@ compute_version(const GLcontext *ctx)
ctx->Extensions.ARB_texture_non_power_of_two && ctx->Extensions.ARB_texture_non_power_of_two &&
ctx->Extensions.EXT_blend_equation_separate); ctx->Extensions.EXT_blend_equation_separate);
const GLboolean ver_2_1 = (ver_2_0 && const GLboolean ver_2_1 = (ver_2_0 &&
ctx->Extensions.ARB_shading_language_120 && /*ctx->Extensions.ARB_shading_language_120 &&*/
ctx->Extensions.EXT_pixel_buffer_object && ctx->Extensions.EXT_pixel_buffer_object &&
ctx->Extensions.EXT_texture_sRGB); ctx->Extensions.EXT_texture_sRGB);
if (ver_2_1) if (ver_2_1)
@@ -121,12 +121,6 @@ _mesa_GetString( GLenum name )
static const char *vendor = "Brian Paul"; static const char *vendor = "Brian Paul";
static const char *renderer = "Mesa"; static const char *renderer = "Mesa";
#if FEATURE_ARB_shading_language_120_foo /* support not complete! */
static const char *sl_version = "1.20";
#elif FEATURE_ARB_shading_language_100
static const char *sl_version = "1.10";
#endif
if (!ctx) if (!ctx)
return NULL; return NULL;
@@ -154,8 +148,10 @@ _mesa_GetString( GLenum name )
return (const GLubyte *) ctx->Extensions.String; return (const GLubyte *) ctx->Extensions.String;
#if FEATURE_ARB_shading_language_100 #if FEATURE_ARB_shading_language_100
case GL_SHADING_LANGUAGE_VERSION_ARB: case GL_SHADING_LANGUAGE_VERSION_ARB:
if (ctx->Extensions.ARB_shading_language_100) if (ctx->Extensions.ARB_shading_language_120)
return (const GLubyte *) sl_version; return (const GLubyte *) "1.20";
else if (ctx->Extensions.ARB_shading_language_100)
return (const GLubyte *) "1.10";
goto error; goto error;
#endif #endif
#if FEATURE_NV_fragment_program || FEATURE_ARB_fragment_program || \ #if FEATURE_NV_fragment_program || FEATURE_ARB_fragment_program || \