diff options
| author | Christian König <[email protected]> | 2010-12-11 13:43:44 +0100 |
|---|---|---|
| committer | Christian König <[email protected]> | 2010-12-11 13:43:44 +0100 |
| commit | 772b25e1f366edc857e77b8c1ccdc5297d82cc41 (patch) | |
| tree | 88d38b52e80319dbd4a0c5b5e038d92f1105110a /docs | |
| parent | ab130400cf91ab471e265e58193c95f04c7aeeda (diff) | |
| parent | b3d2ec9942303d1d03e28a25b030eb060415abfb (diff) | |
Merge remote branch 'origin/master' into pipe-video
Conflicts:
src/gallium/drivers/r600/r600_pipe.c
src/gallium/drivers/r600/r600_texture.c
Diffstat (limited to 'docs')
| -rw-r--r-- | docs/GL3.txt | 12 | ||||
| -rw-r--r-- | docs/MESA_drm_image.spec | 2 |
2 files changed, 13 insertions, 1 deletions
diff --git a/docs/GL3.txt b/docs/GL3.txt index 8628a6e88dd..fb22739b6c7 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 diff --git a/docs/MESA_drm_image.spec b/docs/MESA_drm_image.spec index 118501c3d3e..c9853a7fd0f 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 |