From 96d6df5da9cddedf4931bf8e17f96e242467c661 Mon Sep 17 00:00:00 2001 From: marha Date: Wed, 27 Apr 2011 06:58:32 +0000 Subject: xserver libX11 libxtrans mesa pixman xkeyboard-config git update 27 Apr 2011 --- mesalib/docs/GL3.txt | 12 +- mesalib/docs/README.WIN32 | 105 ++--------------- mesalib/docs/WL_bind_wayland_display.spec | 184 +++++++++++++++--------------- mesalib/docs/install.html | 1 - mesalib/docs/patents.txt | 31 +++++ mesalib/docs/relnotes-7.11.html | 17 +-- 6 files changed, 148 insertions(+), 202 deletions(-) create mode 100644 mesalib/docs/patents.txt (limited to 'mesalib/docs') diff --git a/mesalib/docs/GL3.txt b/mesalib/docs/GL3.txt index e373a9453..f3138afa3 100644 --- a/mesalib/docs/GL3.txt +++ b/mesalib/docs/GL3.txt @@ -12,13 +12,13 @@ Feature Status GL 3.0: -GLSL 1.30 (GL_EXT_gpu_shader4, etc.) not started -Conditional rendering (GL_NV_conditional_render) DONE (swrast & softpipe) +GLSL 1.30 (GL_EXT_gpu_shader4, etc.) started +Conditional rendering (GL_NV_conditional_render) DONE (swrast, softpipe, i965) Map buffer subranges (GL_ARB_map_buffer_range) DONE Clamping controls (GL_ARB_color_buffer_float) DONE Float textures, renderbuffers (GL_ARB_texture_float) DONE (gallium r300) -GL_EXT_packed_float not started -GL_EXT_texture_shared_exponent not started +GL_EXT_packed_float started +GL_EXT_texture_shared_exponent started Float depth buffers (GL_ARB_depth_buffer_float) not started Framebuffer objects (GL_EXT_framebuffer_object) DONE Half-float DONE @@ -80,7 +80,7 @@ GL_ARB_occlusion_query2 DONE (swrast, gallium) GL_ARB_sampler_objects DONE (gallium) GL_ARB_texture_rgb10_a2ui not started GL_ARB_texture_swizzle DONE (same as EXT version) -GL_ARB_timer_query DONE (only Xlib sw driver) +GL_ARB_timer_query ~60% done (the EXT variant) GL_ARB_instanced_arrays DONE (gallium) GL_ARB_vertex_type_2_10_10_10_rev not started @@ -105,7 +105,7 @@ GL_ARB_transform_feedback3 not started GL 4.1: GLSL 4.1 not started -GL_ARB_ES2_compatibility not started +GL_ARB_ES2_compatibility mostly done (Intel?) GL_ARB_get_program_binary not started GL_ARB_separate_shader_objects some infrastructure done GL_ARB_shader_precision not started diff --git a/mesalib/docs/README.WIN32 b/mesalib/docs/README.WIN32 index 986b5994f..ab0df573b 100644 --- a/mesalib/docs/README.WIN32 +++ b/mesalib/docs/README.WIN32 @@ -1,114 +1,33 @@ File: docs/README.WIN32 -Last updated: Apr 25, 2007 - -NOTE: This information only applies to Mesa 7.8 and older. Nowadays -it's probably better to use Scons to build for Windows. +Last updated: 23 April 2011 Quick Start ----- ----- -Unzip the MesaLib, MesaGLUT, and MesaDemos ZIP files into the same -directory. The libs and demos build separately, so if you do not care -about the demos or GLUT, you only need to unzip MesaLib. If you unzip -more than one ZIP file, they all need to be unzipped into the same -directory. Don't worry, you will not overwrite anything. - -The Windows build system uses Microsoft Visual Studio. Project files -for a specific version of Visual Studio are in their own directory in -the top-level "windows" directory. For example, Visual Studio 8 files -are in windows/VC8. +Windows drivers are build with SCons. Makefiles or Visual Studio projects are +no longer shipped or supported. -Support has been dropped for versions of Visual Studio prior to 8. The -main reason is because Microsoft now provides a free compiler and -developer environment. Visual Studio Express can be found at +Run -http://msdn.microsoft.com/vstudio/express/visualc/default.aspx + scons osmesa mesagdi -You'll also need the Platform SDK. Instructions for obtaining and -using the SDK with Visual Studio Express can be found at +to build classic mesa Windows GDI drivers; or -http://msdn.microsoft.com/vstudio/express/visualc/usingpsdk/ + scons libgl-gdi -The project files to build the core Mesa library, Windows Mesa -drivers, OSMesa, and GLU are in the mesa directory. The project files -to build GLUT and some demo programs are in the progs directory. - -Makefiles are no longer shipped or supported, but can be generated -from the projects using Visual Studio. +to build gallium based GDI driver. Windows Drivers ------- ------- -At this time, only the GDI driver is known to work. Most of the demos -in progs/demos should work with this driver. +At this time, only the gallium GDI driver is known to work. Source code also exists in the tree for other drivers in src/mesa/drivers/windows, but the status of this code is unknown. -The GDI driver operates basically by writing pixel spans into a DIB -section and then blitting the DIB to the window. The driver was -recently cleaned up and rewitten and so may have bugs or may be -missing some functionality. The older versions of the CVS source may -be useful in figuring out any problems, or report them to me. - -To build Mesa with the GDI driver, build the mesa, gdi, and glu -projects in the Visual Studio workspace found at - - windows/VC8/mesa/mesa.sln - -The osmesa DLL can also be built with the osmesa project. - -The build system creates a lib top-level directory and copies -resulting LIB and DLL files to this lib directory. The files are: - - OPENGL32.LIB, GLU32.LIB, OSMESA32.LIB - OPENGL32.DLL, GLU32.DLL, OSMESA32.DLL - -If the MesaDemos ZIP file was extracted, the DLL files are also copied -to the demos directory. This facilitates running the demos as described -below. - - -GLUT and Demos ----- --- ----- - -A Visual Studio workspace can be found at - - windows/VC8/progs/progs.sln - -It can be used to build GLUT and a few demos. The GLUT lib and DLL -are copied to the top-level lib directory, along with the Mesa libs. - -The demo build system expects to find the LIB files in the top level -lib directory, so you must build the Mesa libs first. The demo -executables are placed in the demos directory, because some of them -rely on data files found there. Also, the Mesa lib DLL's were copied -there by the Mesa lib build process. Therefore, you should be able to -simply run the demo executables from the demo directory. - -If you want to run the demos from the Visual Studio, you may have to -change the startup directory and explicitly state where the executables are. - -You may also build all the demo programs by using a makefile. Go to -the progs/demos directory and make sure you have executed VCVARS32.BAT -or whatever setup script is appropriate for your compiler. Then, - - nmake -f Makefile.win - -should build all the demos. - - -Build System Notes ------ ------ ----- - -VC8 ---- - -No notes. - General ------- @@ -128,11 +47,5 @@ the linker import files associated with the DLL files. The si-glu sources are used to build the GLU libs. This was done mainly to get the better tessellator code. -To build "mangled" Mesa, add the preprocessor define USE_MGL_NAMESPACE -to the project settings. You will also need to edit src/mesa.def to -change all the gl* symbols to mgl*. Because this is easy to do with a -global replace operation in a text editor, no additional mangled -version of mesa.def is maintained or shipped. - If you have a Windows-related build problem or question, please post to the mesa-dev or mesa-users list. diff --git a/mesalib/docs/WL_bind_wayland_display.spec b/mesalib/docs/WL_bind_wayland_display.spec index 577496af0..e2fde3c50 100644 --- a/mesalib/docs/WL_bind_wayland_display.spec +++ b/mesalib/docs/WL_bind_wayland_display.spec @@ -1,92 +1,92 @@ -Name - - WL_bind_wayland_display - -Name Strings - - EGL_WL_bind_wayland_display - -Contact - - Kristian Høgsberg - Benjamin Franzke - -Status - - Proposal - -Version - - Version 1, March 1, 2011 - -Number - - EGL Extension #not assigned - -Dependencies - - Requires EGL 1.4 or later. This extension is written against the - wording of the EGL 1.4 specification. - - EGL_KHR_base_image is required. - -Overview - - This extension provides entry points for binding and unbinding the - wl_display of a Wayland compositor to an EGLDisplay. Binding a - wl_display means that the EGL implementation should provide one or - more interfaces in the Wayland protocol to allow clients to create - wl_buffer objects. On the server side, this extension also - provides a new target for eglCreateImageKHR, to create an EGLImage - from a wl_buffer - - Adding an implementation specific wayland interface, allows the - EGL implementation to define specific wayland requests and events, - needed for buffer sharing in an EGL wayland platform. - -IP Status - - Open-source; freely implementable. - -New Procedures and Functions - - EGLBoolean eglBindWaylandDisplayWL(EGLDisplay dpy, - struct wl_display *display); - - EGLBoolean eglUnbindWaylandDisplayWL(EGLDisplay dpy, - struct wl_display *display); - -New Tokens - - Accepted as in eglCreateImageKHR - - EGL_WAYLAND_BUFFER_WL 0x31D5 - -Additions to the EGL 1.4 Specification: - - To bind a server side wl_display to an EGLDisplay, call - - EGLBoolean eglBindWaylandDisplayWL(EGLDisplay dpy, - struct wl_display *display); - - To unbind a server side wl_display from an EGLDisplay, call - - EGLBoolean eglUnbindWaylandDisplayWL(EGLDisplay dpy, - struct wl_display *display); - - eglBindWaylandDisplayWL returns EGL_FALSE when there is already a - wl_display bound to EGLDisplay otherwise EGL_TRUE. - - eglUnbindWaylandDisplayWL returns EGL_FALSE when there is no - wl_display bound to the EGLDisplay currently otherwise EGL_TRUE. - - Import a wl_buffer by calling eglCreateImageKHR with - wl_buffer as EGLClientBuffer, EGL_WAYLAND_BUFFER_WL as the target, - and an empty attribute_list. - -Issues - -Revision History - - Version 1, March 1, 2011 - Initial draft (Benjamin Franzke) +Name + + WL_bind_wayland_display + +Name Strings + + EGL_WL_bind_wayland_display + +Contact + + Kristian Høgsberg + Benjamin Franzke + +Status + + Proposal + +Version + + Version 1, March 1, 2011 + +Number + + EGL Extension #not assigned + +Dependencies + + Requires EGL 1.4 or later. This extension is written against the + wording of the EGL 1.4 specification. + + EGL_KHR_base_image is required. + +Overview + + This extension provides entry points for binding and unbinding the + wl_display of a Wayland compositor to an EGLDisplay. Binding a + wl_display means that the EGL implementation should provide one or + more interfaces in the Wayland protocol to allow clients to create + wl_buffer objects. On the server side, this extension also + provides a new target for eglCreateImageKHR, to create an EGLImage + from a wl_buffer + + Adding an implementation specific wayland interface, allows the + EGL implementation to define specific wayland requests and events, + needed for buffer sharing in an EGL wayland platform. + +IP Status + + Open-source; freely implementable. + +New Procedures and Functions + + EGLBoolean eglBindWaylandDisplayWL(EGLDisplay dpy, + struct wl_display *display); + + EGLBoolean eglUnbindWaylandDisplayWL(EGLDisplay dpy, + struct wl_display *display); + +New Tokens + + Accepted as in eglCreateImageKHR + + EGL_WAYLAND_BUFFER_WL 0x31D5 + +Additions to the EGL 1.4 Specification: + + To bind a server side wl_display to an EGLDisplay, call + + EGLBoolean eglBindWaylandDisplayWL(EGLDisplay dpy, + struct wl_display *display); + + To unbind a server side wl_display from an EGLDisplay, call + + EGLBoolean eglUnbindWaylandDisplayWL(EGLDisplay dpy, + struct wl_display *display); + + eglBindWaylandDisplayWL returns EGL_FALSE when there is already a + wl_display bound to EGLDisplay otherwise EGL_TRUE. + + eglUnbindWaylandDisplayWL returns EGL_FALSE when there is no + wl_display bound to the EGLDisplay currently otherwise EGL_TRUE. + + Import a wl_buffer by calling eglCreateImageKHR with + wl_buffer as EGLClientBuffer, EGL_WAYLAND_BUFFER_WL as the target, + NULL context and an empty attribute_list. + +Issues + +Revision History + + Version 1, March 1, 2011 + Initial draft (Benjamin Franzke) diff --git a/mesalib/docs/install.html b/mesalib/docs/install.html index bfa3bb8f8..e1018119a 100644 --- a/mesalib/docs/install.html +++ b/mesalib/docs/install.html @@ -274,7 +274,6 @@ For example, compiling and linking a GLUT application can be done with:

Please see the instructions on building with SCons. -Alternatively see README.WIN32 file.

diff --git a/mesalib/docs/patents.txt b/mesalib/docs/patents.txt new file mode 100644 index 000000000..3834e255c --- /dev/null +++ b/mesalib/docs/patents.txt @@ -0,0 +1,31 @@ +ARB_texture_float: + + Silicon Graphics, Inc. owns US Patent #6,650,327, issued November 18, + 2003 [1]. + + SGI believes this patent contains necessary IP for graphics systems + implementing floating point rasterization and floating point + framebuffer capabilities described in ARB_texture_float extension, and + will discuss licensing on RAND terms, on an individual basis with + companies wishing to use this IP in the context of conformant OpenGL + implementations [2]. + + The source code to implement ARB_texture_float extension is included + and can be toggled on at compile time, for those who purchased a + license from SGI, or are in a country where the patent does not apply, + etc. + + The software is provided "as is", without warranty of any kind, express + or implied, including but not limited to the warranties of + merchantability, fitness for a particular purpose and noninfringement. + In no event shall the authors or copyright holders be liable for any + claim, damages or other liability, whether in an action of contract, + tort or otherwise, arising from, out of or in connection with the + software or the use or other dealings in the software. + + You should contact a lawyer or SGI's legal department if you want to + enable this extension. + + +[1] http://www.google.com/patents/about?id=mIIOAAAAEBAJ&dq=6650327 +[2] http://www.opengl.org/registry/specs/ARB/texture_float.txt diff --git a/mesalib/docs/relnotes-7.11.html b/mesalib/docs/relnotes-7.11.html index 131fecd18..3b7f9a21d 100644 --- a/mesalib/docs/relnotes-7.11.html +++ b/mesalib/docs/relnotes-7.11.html @@ -36,21 +36,23 @@ tbd

New features

    -
  • GL_ARB_color_buffer_float (gallium drivers) +
  • GL_ARB_color_buffer_float (gallium drivers, i965)
  • GL_ARB_draw_buffers_blend (gallium)
  • GL_ARB_draw_instanced extension (gallium drivers, swrast)
  • GL_ARB_instanced_arrays extension (gallium drivers)
  • GL_ARB_occlusion_query2 (gallium drivers, swrast) +
  • GL_ARB_robustness (all drivers)
  • GL_ARB_sampler_objects (gallium drivers) -
  • GL_ARB_texture_compression_rgtc (gallium drivers, swrast) -
  • GL_ARB_texture_float (gallium) +
  • GL_ARB_texture_compression_rgtc (gallium drivers, swrast, i965) +
  • GL_ARB_texture_float (gallium, i965)
  • GL_EXT_texture_compression_latc (gallium drivers, swrast) -
  • GL_EXT_texture_compression_rgtc (gallium drivers, swrast) +
  • GL_EXT_texture_compression_rgtc (gallium drivers, swrast, i965)
  • GL_EXT_texture_sRGB_decode (gallium drivers, swrast, i965)
  • GL_EXT_texture_snorm (gallium drivers)
  • GL_ATI_draw_buffers (all drivers)
  • GL_ATI_texture_compression_3dc (gallium drivers, swrast) -
  • GL_ATI_texture_float (gallium) +
  • GL_ATI_texture_float (gallium, i965) +
  • GL_NV_conditional_render (i965)
  • GL_NV_texture_barrier (gallium drivers)
@@ -62,8 +64,9 @@ tbd

Changes

    -
  • The Windows MSVC project files have been removed. They haven't been maintained -in quite a while. Building with SCons is an alterantive. +
  • The Windows MSVC project files have been removed. +They haven't been maintained in quite a while. +Building with SCons is an alternative.
  • Removed GL_SGI_texture_color_table support from swrast driver - the only driver that implemented it.
-- cgit v1.2.3