llvmpipe: bump glsl version to 140

texel offsets should have been the last missing feature for 130, and in
fact 140 as well (last there were texture buffers). In any case we still
don't do OpenGL 3.0 (missing MSAA which will be difficult,
plus EXT_packed_float, ARB_depth_buffer_float and EXT_framebuffer_sRGB).

v2: bump to 140 instead - we have everything except we crash when not writing
to gl_Position (but softpipe crashes as well) so let's just say this is a bug
instead. Also (by Dave Airlie's suggestion) update llvm-todo.txt.

Reviewed-by: Jose Fonseca <jfonseca@vmware.com>

diff --git a/src/gallium/docs/llvm-todo.txt b/src/gallium/docs/llvm-todo.txt
index a5a8c1a5595d354cfaa310f25688232faef62590..270f66c5117996c4e78f1847a341f590b2766fd6 100644 (file)
--- a/src/gallium/docs/llvm-todo.txt
+++ b/src/gallium/docs/llvm-todo.txt
@@ -4,18 +4,11 @@ TODO covering gallivm/llvmpipe
 Goal: GL3.0 support in llvmpipe
 -------------------------------
 
-TXQ opcode support - airlied WIP
-TXF opcode support.
-Integer texture fetch support
-Integer renderbuffer support
-Vertex ID support.
-EXT_transform_feedback support - airlied WIP
-clip distance support - airlied WIP
-vertex clip support - airlied WIP
-EXT_texture_array support - Jakob WIP
+EXT_packed_float support.
+ARB_depth_buffer_float support.
+EXT_framebuffer_sRGB support.
+MSAA support.
 
 Goal: extension parity with softpipe:
 -------------------------------------
-GL3.0 support.
-EXT_timer_query - airlied posted a patch
 

diff --git a/src/gallium/drivers/llvmpipe/lp_screen.c b/src/gallium/drivers/llvmpipe/lp_screen.c
index 05bbca5e19b0c4eb4d486c8d9bba23aa2b6f5645..93e125da38d99f5125760a3f456018ca1a01c736 100644 (file)
--- a/src/gallium/drivers/llvmpipe/lp_screen.c
+++ b/src/gallium/drivers/llvmpipe/lp_screen.c
@@ -195,7 +195,7 @@ llvmpipe_get_param(struct pipe_screen *screen, enum pipe_cap param)
    case PIPE_CAP_VERTEX_COLOR_CLAMPED:
       return 1;
    case PIPE_CAP_GLSL_FEATURE_LEVEL:
-      return 120;
+      return 140;
    case PIPE_CAP_QUADS_FOLLOW_PROVOKING_VERTEX_CONVENTION:
       return 0;
    case PIPE_CAP_COMPUTE: