From 48af60b46540a30c3754f0e59801a62dfb1a146d Mon Sep 17 00:00:00 2001 From: Brian Paul Date: Wed, 17 Nov 2010 08:10:26 -0700 Subject: mesa: upgrade to glext.h version 66 The type of the num/count parameter to glProgramParameters4[df]vNV() changed so some API dispatch code needed updates too. --- docs/relnotes-7.10.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'docs') diff --git a/docs/relnotes-7.10.html b/docs/relnotes-7.10.html index 6706caf41d..1f5570d71d 100644 --- a/docs/relnotes-7.10.html +++ b/docs/relnotes-7.10.html @@ -49,7 +49,7 @@ tbd

Changes

-- cgit v1.2.3 From 0ec0f1025d70d0fc353acd9f6184e3aeb8a0f464 Mon Sep 17 00:00:00 2001 From: Brian Paul Date: Sun, 21 Nov 2010 09:31:19 -0700 Subject: docs: update some GL 3.0 status --- docs/GL3.txt | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) (limited to 'docs') diff --git a/docs/GL3.txt b/docs/GL3.txt index cf772a631a..8628a6e88d 100644 --- a/docs/GL3.txt +++ b/docs/GL3.txt @@ -20,7 +20,7 @@ Float textures, renderbuffers some infrastructure done Framebuffer objects (GL_EXT_framebuffer_object) DONE Half-float some infrastructure done Multisample blit DONE -Non-normalized Integer texture/framebuffer formats not started +Non-normalized Integer texture/framebuffer formats ~50% done 1D/2D Texture arrays core Mesa, swrast done Packed depth/stencil formats DONE Per-buffer blend and masks (GL_EXT_draw_buffers2) DONE @@ -31,10 +31,11 @@ Transform feedback (GL_EXT_transform_feedback) ~50% done glBindBufferRange, glBindBufferBase commands Vertex array objects (GL_APPLE_vertex_array_object) DONE sRGB framebuffer format (GL_EXT_framebuffer_sRGB) not started -glClearBuffer commands DONE, except for dispatch -glGetStringi command DONE, except for dispatch -glTexParameterI, glGetTexParameterI commands DONE, except for dispatch -glVertexAttribI commands not started +glClearBuffer commands DONE +glGetStringi command DONE +glTexParameterI, glGetTexParameterI commands DONE +glVertexAttribI commands DONE (but converts int + values to floats) GL 3.1: -- cgit v1.2.3 From 2892c8bdbc7ae4b3e59a0900329f037ab67510c5 Mon Sep 17 00:00:00 2001 From: Marek Olšák Date: Sun, 21 Nov 2010 22:54:33 +0100 Subject: docs: add GL 4.1 status --- docs/GL3.txt | 12 ++++++++++++ 1 file changed, 12 insertions(+) (limited to 'docs') diff --git a/docs/GL3.txt b/docs/GL3.txt index 8628a6e88d..fb22739b6c 100644 --- a/docs/GL3.txt +++ b/docs/GL3.txt @@ -94,6 +94,18 @@ GL_ARB_texture_buffer_object_rgb32 not started GL_ARB_texture_cube_map_array not started GL_ARB_texture_gather not started GL_ARB_transform_feedback2 not started +GL_ARB_transform_feedback3 not started + + +GL 4.1: + +GLSL 4.1 not started +GL_ARB_ES2_compatibility not started +GL_ARB_get_program_binary not started +GL_ARB_separate_shader_objects some infrastructure done +GL_ARB_shader_precision not started +GL_ARB_vertex_attrib_64bit not started +GL_ARB_viewport_array not started -- cgit v1.2.3 From 7db49853f07dc62d76c7f00ab19b672e16604260 Mon Sep 17 00:00:00 2001 From: Kristian Høgsberg Date: Mon, 29 Nov 2010 21:04:43 -0500 Subject: docs: Fix MESA_drm_image typo --- docs/MESA_drm_image.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'docs') diff --git a/docs/MESA_drm_image.spec b/docs/MESA_drm_image.spec index 118501c3d3..c9853a7fd0 100644 --- a/docs/MESA_drm_image.spec +++ b/docs/MESA_drm_image.spec @@ -83,7 +83,7 @@ Additions to the EGL 1.4 Specification: EGLImageKHR eglCreateDRMImageMESA(EGLDisplay dpy, const EGLint *attrib_list); - In the attribute list, pass EGL_WIDTH, EGL_EIGHT and format and + In the attribute list, pass EGL_WIDTH, EGL_HEIGHT and format and use in the attrib list using EGL_DRM_BUFFER_FORMAT_MESA and EGL_DRM_BUFFER_USE_MESA. The only format specified by this extension is EGL_DRM_BUFFER_FORMAT_ARGB32_MESA, where each pixel -- cgit v1.2.3 From ff7aa554a11863de2c4c0b4b6d1ec7b07c819739 Mon Sep 17 00:00:00 2001 From: Dave Airlie Date: Sun, 12 Sep 2010 06:31:30 +1000 Subject: mesa/swrast/st: add ARB_occlusion_query2 support. This gets my vote for most pointless extension of all time, I'm guessing some driver could possibly optimise for this instead of counting it might just get a true/false, but I'm not really sure. need this to eventually advertise 3.3 despite its total uselessness. Signed-off-by: Dave Airlie --- docs/GL3.txt | 2 +- src/mesa/main/extensions.c | 1 + src/mesa/main/queryobj.c | 43 ++++++++++++++++++++++++---------- src/mesa/state_tracker/st_extensions.c | 1 + 4 files changed, 34 insertions(+), 13 deletions(-) (limited to 'docs') diff --git a/docs/GL3.txt b/docs/GL3.txt index fb22739b6c..9106f439a1 100644 --- a/docs/GL3.txt +++ b/docs/GL3.txt @@ -71,7 +71,7 @@ GL 3.3: GLSL 3.30 not started GL_ARB_blend_func_extended not started GL_ARB_explicit_attrib_location DONE (swrast, i915, i965) -GL_ARB_occlusion_query2 not started +GL_ARB_occlusion_query2 DONE (swrast, gallium) GL_ARB_sampler_objects not started GL_ARB_texture_rgb10_a2ui not started GL_ARB_texture_swizzle DONE (same as EXT version) diff --git a/src/mesa/main/extensions.c b/src/mesa/main/extensions.c index f3bf5cb164..fd5b4e915c 100644 --- a/src/mesa/main/extensions.c +++ b/src/mesa/main/extensions.c @@ -259,6 +259,7 @@ _mesa_enable_sw_extensions(struct gl_context *ctx) ctx->Extensions.ARB_multitexture = GL_TRUE; #if FEATURE_queryobj ctx->Extensions.ARB_occlusion_query = GL_TRUE; + ctx->Extensions.ARB_occlusion_query2 = GL_TRUE; #endif ctx->Extensions.ARB_point_sprite = GL_TRUE; #if FEATURE_ARB_shader_objects diff --git a/src/mesa/main/queryobj.c b/src/mesa/main/queryobj.c index 8874397720..ca829b09bd 100644 --- a/src/mesa/main/queryobj.c +++ b/src/mesa/main/queryobj.c @@ -143,6 +143,11 @@ get_query_binding_point(struct gl_context *ctx, GLenum target) return &ctx->Query.CurrentOcclusionObject; else return NULL; + case GL_ANY_SAMPLES_PASSED: + if (ctx->Extensions.ARB_occlusion_query2) + return &ctx->Query.CurrentOcclusionObject; + else + return NULL; case GL_TIME_ELAPSED_EXT: if (ctx->Extensions.EXT_timer_query) return &ctx->Query.CurrentTimerObject; @@ -378,12 +383,19 @@ _mesa_GetQueryObjectivARB(GLuint id, GLenum pname, GLint *params) if (!q->Ready) ctx->Driver.WaitQuery(ctx, q); /* if result is too large for returned type, clamp to max value */ - if (q->Result > 0x7fffffff) { - *params = 0x7fffffff; - } - else { - *params = (GLint)q->Result; - } + if (q->Target == GL_ANY_SAMPLES_PASSED) { + if (q->Result) + *params = GL_TRUE; + else + *params = GL_FALSE; + } else { + if (q->Result > 0x7fffffff) { + *params = 0x7fffffff; + } + else { + *params = (GLint)q->Result; + } + } break; case GL_QUERY_RESULT_AVAILABLE_ARB: if (!q->Ready) @@ -418,12 +430,19 @@ _mesa_GetQueryObjectuivARB(GLuint id, GLenum pname, GLuint *params) if (!q->Ready) ctx->Driver.WaitQuery(ctx, q); /* if result is too large for returned type, clamp to max value */ - if (q->Result > 0xffffffff) { - *params = 0xffffffff; - } - else { - *params = (GLuint)q->Result; - } + if (q->Target == GL_ANY_SAMPLES_PASSED) { + if (q->Result) + *params = GL_TRUE; + else + *params = GL_FALSE; + } else { + if (q->Result > 0xffffffff) { + *params = 0xffffffff; + } + else { + *params = (GLuint)q->Result; + } + } break; case GL_QUERY_RESULT_AVAILABLE_ARB: if (!q->Ready) diff --git a/src/mesa/state_tracker/st_extensions.c b/src/mesa/state_tracker/st_extensions.c index 51a45a7d51..62c9ce7273 100644 --- a/src/mesa/state_tracker/st_extensions.c +++ b/src/mesa/state_tracker/st_extensions.c @@ -343,6 +343,7 @@ void st_init_extensions(struct st_context *st) if (screen->get_param(screen, PIPE_CAP_OCCLUSION_QUERY)) { ctx->Extensions.ARB_occlusion_query = GL_TRUE; + ctx->Extensions.ARB_occlusion_query2 = GL_TRUE; } if (screen->get_param(screen, PIPE_CAP_TIMER_QUERY)) { ctx->Extensions.EXT_timer_query = GL_TRUE; -- cgit v1.2.3