diff options
| author | Ian Romanick <[email protected]> | 2012-08-08 15:25:00 -0700 |
|---|---|---|
| committer | Jordan Justen <[email protected]> | 2013-01-04 17:25:28 -0800 |
| commit | 3b495d815f608ad432edfecc82f3887164019993 (patch) | |
| tree | 32f7c86033e55487ee9bced41fd84164eb6407a5 | |
| parent | 0538b36baca0708a8a3d9f730e596605f59a3255 (diff) | |
mesa/es3: Enable ES 3.0 API and shading language version
Signed-off-by: Ian Romanick <[email protected]>
| -rw-r--r-- | src/mesa/main/getstring.c | 4 | ||||
| -rw-r--r-- | src/mesa/main/version.c | 23 |
2 files changed, 25 insertions, 2 deletions
diff --git a/src/mesa/main/getstring.c b/src/mesa/main/getstring.c index 20e7a014d12..5d8b372a39c 100644 --- a/src/mesa/main/getstring.c +++ b/src/mesa/main/getstring.c @@ -74,7 +74,9 @@ shading_language_version(struct gl_context *ctx) break; case API_OPENGLES2: - return (const GLubyte *) "OpenGL ES GLSL ES 1.0.16"; + return (ctx->Version < 30) + ? (const GLubyte *) "OpenGL ES GLSL ES 1.0.16" + : (const GLubyte *) "OpenGL ES GLSL ES 3.0"; case API_OPENGLES: /* fall-through */ diff --git a/src/mesa/main/version.c b/src/mesa/main/version.c index 4373d7b9180..5b6a794b441 100644 --- a/src/mesa/main/version.c +++ b/src/mesa/main/version.c @@ -323,7 +323,28 @@ compute_version_es2(struct gl_context *ctx) ctx->Extensions.ARB_fragment_shader && ctx->Extensions.ARB_texture_non_power_of_two && ctx->Extensions.EXT_blend_equation_separate); - if (ver_2_0) { + /* FINISHME: This list isn't quite right. */ + const GLboolean ver_3_0 = (ctx->Extensions.ARB_half_float_vertex && + ctx->Extensions.ARB_map_buffer_range && + ctx->Extensions.ARB_shader_texture_lod && + ctx->Extensions.ARB_texture_float && + ctx->Extensions.ARB_texture_rg && + ctx->Extensions.ARB_texture_compression_rgtc && + ctx->Extensions.EXT_draw_buffers2 && + /* ctx->Extensions.ARB_framebuffer_object && */ + ctx->Extensions.EXT_framebuffer_sRGB && + ctx->Extensions.EXT_packed_float && + ctx->Extensions.EXT_texture_array && + ctx->Extensions.EXT_texture_shared_exponent && + ctx->Extensions.EXT_transform_feedback && + ctx->Extensions.NV_conditional_render && + ctx->Extensions.ARB_draw_instanced && + ctx->Extensions.ARB_uniform_buffer_object && + ctx->Extensions.EXT_texture_snorm && + ctx->Extensions.NV_primitive_restart); + if (ver_3_0) { + ctx->Version = 30; + } else if (ver_2_0) { ctx->Version = 20; } else { _mesa_problem(ctx, "Incomplete OpenGL ES 2.0 support."); |