summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRoland Scheidegger <sroland@vmware.com>2013-03-01 13:50:32 (GMT)
committerRoland Scheidegger <sroland@vmware.com>2013-03-02 01:54:30 (GMT)
commit4c12276607e6a95a9a0c5997f018605e86aa5843 (patch)
tree0cfec74c6b9d053890481b6cb016e26660041d74
parentb3b3b389fa7756869e7a8bc2755bce081c94945f (diff)
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>
-rw-r--r--src/gallium/docs/llvm-todo.txt15
-rw-r--r--src/gallium/drivers/llvmpipe/lp_screen.c2
2 files changed, 5 insertions, 12 deletions
diff --git a/src/gallium/docs/llvm-todo.txt b/src/gallium/docs/llvm-todo.txt
index a5a8c1a..270f66c 100644
--- 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 05bbca5..93e125d 100644
--- 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: