
A first attempt at moving gallium onto a branch directly off master... It will be interesting to see how much work this takes to get running. Have resolved the conflicts semi-arbitarily, not compiled or tested. Conflicts: .gitignore Makefile configs/config.mgw configs/darwin configs/darwin-x86ppc configs/default configs/freebsd-dri configs/linux-dri configs/linux-dri-xcb configs/linux-fbdev configs/linux-static configs/linux-x86-64-static configs/linux-x86-static doxygen/Makefile include/GL/gl.h progs/demos/Makefile progs/demos/descrip.mms progs/demos/texenv.c progs/egl/.gitignore progs/egl/Makefile progs/glsl/.gitignore progs/glsl/Makefile progs/glsl/convolutions.c progs/samples/Makefile.mgw progs/tests/.gitignore progs/trivial/.gitignore progs/trivial/point-param.c progs/trivial/tri.c progs/xdemos/.gitignore progs/xdemos/glthreads.c src/egl/drivers/demo/Makefile src/egl/drivers/dri/Makefile src/egl/main/Makefile src/glu/Makefile src/glu/sgi/Makefile src/glu/sgi/Makefile.mgw src/glut/glx/Makefile.mgw src/glut/os2/WarpWin.cpp src/glut/os2/glut_cindex.cpp src/glut/os2/glut_gamemode.cpp src/glut/os2/glut_win.cpp src/glut/os2/glut_winmisc.cpp src/glut/os2/os2_glx.cpp src/glut/os2/os2_menu.cpp src/glut/os2/os2_winproc.cpp src/glw/Makefile src/glx/x11/dri_glx.c src/glx/x11/glxext.c src/mesa/Makefile src/mesa/Makefile.mgw src/mesa/descrip.mms src/mesa/drivers/beos/Makefile src/mesa/drivers/common/descrip.mms src/mesa/drivers/common/driverfuncs.c src/mesa/drivers/directfb/Makefile src/mesa/drivers/dri/Makefile.template src/mesa/drivers/dri/common/dri_bufmgr.c src/mesa/drivers/dri/common/dri_bufmgr.h src/mesa/drivers/dri/common/dri_util.c src/mesa/drivers/dri/common/extension_helper.h src/mesa/drivers/dri/common/mmio.h src/mesa/drivers/dri/common/utils.c src/mesa/drivers/dri/common/utils.h src/mesa/drivers/dri/glcore/Makefile src/mesa/drivers/dri/i810/i810screen.c src/mesa/drivers/dri/i915/intel_ioctl.c src/mesa/drivers/dri/i915/intel_ioctl.h src/mesa/drivers/dri/i915/intel_screen.c src/mesa/drivers/dri/i915/server/i830_common.h src/mesa/drivers/dri/i915/server/i830_dri.h src/mesa/drivers/dri/i965/intel_screen.c src/mesa/drivers/dri/i965/server/i830_common.h src/mesa/drivers/dri/i965/server/i830_dri.h src/mesa/drivers/dri/mach64/mach64_screen.c src/mesa/drivers/dri/nouveau/nouveau_context.h src/mesa/drivers/dri/nouveau/nouveau_fifo.c src/mesa/drivers/dri/nouveau/nouveau_fifo.h src/mesa/drivers/dri/nouveau/nouveau_screen.c src/mesa/drivers/dri/nouveau/nouveau_screen.h src/mesa/drivers/dri/r128/r128_tex.h src/mesa/drivers/dri/savage/savageioctl.h src/mesa/drivers/fbdev/Makefile src/mesa/drivers/osmesa/Makefile src/mesa/drivers/osmesa/descrip.mms src/mesa/drivers/x11/Makefile src/mesa/drivers/x11/descrip.mms src/mesa/drivers/x11/xm_dd.c src/mesa/glapi/glapi.c src/mesa/glapi/glthread.c src/mesa/main/api_validate.c src/mesa/main/attrib.c src/mesa/main/bufferobj.c src/mesa/main/bufferobj.h src/mesa/main/buffers.c src/mesa/main/config.h src/mesa/main/context.c src/mesa/main/descrip.mms src/mesa/main/drawpix.c src/mesa/main/enums.c src/mesa/main/fbobject.c src/mesa/main/glheader.h src/mesa/main/imports.c src/mesa/main/mipmap.c src/mesa/main/mm.c src/mesa/main/mm.h src/mesa/main/mtypes.h src/mesa/main/points.c src/mesa/main/sources src/mesa/main/state.c src/mesa/main/texcompress_fxt1.c src/mesa/main/texenvprogram.c src/mesa/main/texobj.c src/mesa/main/texstate.c src/mesa/main/texstore.c src/mesa/math/descrip.mms src/mesa/shader/arbprogram.c src/mesa/shader/descrip.mms src/mesa/shader/prog_execute.c src/mesa/shader/prog_statevars.c src/mesa/shader/prog_statevars.h src/mesa/shader/prog_uniform.c src/mesa/shader/program.c src/mesa/shader/program.h src/mesa/shader/shader_api.c src/mesa/shader/slang/descrip.mms src/mesa/shader/slang/library/slang_vertex_builtin_gc.h src/mesa/sources src/mesa/swrast/descrip.mms src/mesa/swrast/s_drawpix.c src/mesa/swrast/s_fragprog.c src/mesa/swrast/s_readpix.c src/mesa/swrast/s_span.c src/mesa/swrast_setup/descrip.mms src/mesa/tnl/descrip.mms src/mesa/tnl/t_context.h src/mesa/tnl/t_vp_build.c src/mesa/tnl/tnl.h src/mesa/vbo/descrip.mms src/mesa/vbo/vbo_context.c src/mesa/vbo/vbo_exec_array.c src/mesa/x86-64/xform4.S src/mesa/x86/rtasm/x86sse.c src/mesa/x86/rtasm/x86sse.h windows/VC6/progs/glut/glut.dsp windows/VC7/mesa/gdi/gdi.vcproj windows/VC7/mesa/glu/glu.vcproj windows/VC7/mesa/mesa.sln windows/VC7/mesa/mesa/mesa.vcproj windows/VC7/mesa/osmesa/osmesa.vcproj windows/VC7/progs/glut/glut.vcproj windows/VC8/mesa/gdi/gdi.vcproj windows/VC8/mesa/glu/glu.vcproj windows/VC8/mesa/mesa.sln windows/VC8/mesa/mesa/mesa.vcproj windows/VC8/progs/glut/glut.vcproj
231 lines
6.8 KiB
RPMSpec
231 lines
6.8 KiB
RPMSpec
Name
|
|
|
|
MESA_packed_depth_stencil
|
|
|
|
Name Strings
|
|
|
|
GL_MESA_packed_depth_stencil
|
|
|
|
Contact
|
|
|
|
Keith Whitwell, VA Linux Systems Inc. (keithw 'at' valinux.com)
|
|
Brian Paul, VA Linux Systems Inc. (brianp 'at' valinux.com)
|
|
|
|
Status
|
|
|
|
Obsolete.
|
|
|
|
Version
|
|
|
|
|
|
Number
|
|
|
|
???
|
|
|
|
Dependencies
|
|
|
|
EXT_abgr affects the definition of this extension
|
|
SGIS_texture4D affects the definition of this extension
|
|
EXT_cmyka affects the definition of this extension
|
|
ARB_packed_pixels affects the definition of this extension
|
|
|
|
Overview
|
|
|
|
Provides a mechanism for DrawPixels and ReadPixels to efficiently
|
|
transfer depth and stencil image data. Specifically, we defined new
|
|
packed pixel formats and types which pack both stencil and depth
|
|
into one value.
|
|
|
|
Issues:
|
|
|
|
1. Is this the right way to distinguish between 24/8 and 8/24
|
|
pixel formats? Should we instead provide both:
|
|
|
|
GL_DEPTH_STENCIL_MESA
|
|
GL_STENCIL_DEPTH_MESA
|
|
|
|
And perhaps just use GL_UNSIGNED_INT, GL_UNSIGNED_SHORT ?
|
|
|
|
2. If not, is it correct to use _REV to indicate that stencil
|
|
preceeds depth in the 1_15 and 8_24 formats?
|
|
|
|
3. Do we really want the GL_UNSIGNED_SHORT formats?
|
|
|
|
|
|
New Procedures and Functions
|
|
|
|
None.
|
|
|
|
New Tokens
|
|
|
|
Accepted by the <format> parameter of ReadPixels and DrawPixels:
|
|
|
|
GL_DEPTH_STENCIL_MESA 0x8750
|
|
|
|
Accepted by the <type> parameter of ReadPixels and DrawPixels:
|
|
|
|
GL_UNSIGNED_INT_24_8_MESA 0x8751
|
|
GL_UNSIGNED_INT_8_24_REV_MESA 0x8752
|
|
GL_UNSIGNED_SHORT_15_1_MESA 0x8753
|
|
GL_UNSIGNED_SHORT_1_15_REV_MESA 0x8754
|
|
|
|
Additions to Chapter 2 of the 1.1 Specification (OpenGL Operation)
|
|
|
|
None
|
|
|
|
Additions to Chapter 3 of the 1.1 Specification (Rasterization)
|
|
|
|
One entry is added to table 3.5 (DrawPixels and ReadPixels formats).
|
|
The new table is:
|
|
|
|
Target
|
|
Format Name Buffer Element Meaning and Order
|
|
----------- ------ -------------------------
|
|
COLOR_INDEX Color Color index
|
|
STENCIL_INDEX Stencil Stencil index
|
|
DEPTH_COMPONENT Depth Depth component
|
|
RED Color R component
|
|
GREEN Color G component
|
|
BLUE Color B component
|
|
ALPHA Color A component
|
|
RGB Color R, G, B components
|
|
RGBA Color R, G, B, A components
|
|
BGRA Color B, G, R, A components
|
|
ABGR_EXT Color A, B, G, R components
|
|
CMYK_EXT Color Cyan, Magenta, Yellow, Black components
|
|
CMYKA_EXT Color Cyan, Magenta, Yellow, Black, A components
|
|
LUMINANCE Color Luminance component
|
|
LUMINANCE_ALPHA Color Luminance, A components
|
|
DEPTH_STENCIL Depth, Depth component, stencil index.
|
|
Stencil
|
|
|
|
Table 3.5: DrawPixels and ReadPixels formats. The third column
|
|
gives a description of and the number and order of elements in a
|
|
group.
|
|
|
|
Add to the description of packed pixel formats:
|
|
|
|
<type> Parameter Data of Matching
|
|
Token Name Type Elements Pixel Formats
|
|
---------------- ---- -------- -------------
|
|
|
|
UNSIGNED_BYTE_3_3_2 ubyte 3 RGB
|
|
UNSIGNED_BYTE_2_3_3_REV ubyte 3 RGB
|
|
UNSIGNED_SHORT_5_6_5 ushort 3 RGB
|
|
UNSIGNED_SHORT_5_6_5_REV ushort 3 RGB
|
|
UNSIGNED_SHORT_4_4_4_4 ushort 4 RGBA,BGRA,ABGR_EXT,CMYK_EXT
|
|
UNSIGNED_SHORT_4_4_4_4_REV ushort 4 RGBA,BGRA
|
|
UNSIGNED_SHORT_5_5_5_1 ushort 4 RGBA,BGRA,ABGR_EXT,CMYK_EXT
|
|
UNSIGNED_SHORT_1_5_5_5_REV ushort 4 RGBA,BGRA
|
|
UNSIGNED_INT_8_8_8_8 uint 4 RGBA,BGRA,ABGR_EXT,CMYK_EXT
|
|
UNSIGNED_INT_8_8_8_8_REV uint 4 RGBA,BGRA
|
|
UNSIGNED_INT_10_10_10_2 uint 4 RGBA,BGRA,ABGR_EXT,CMYK_EXT
|
|
UNSIGNED_INT_2_10_10_10_REV uint 4 RGBA,BGRA
|
|
UNSIGNED_SHORT_15_1_MESA ushort 2 DEPTH_STENCIL_MESA
|
|
UNSIGNED_SHORT_1_15_REV_MESA ushort 2 DEPTH_STENCIL_MESA
|
|
UNSIGNED_SHORT_24_8_MESA ushort 2 DEPTH_STENCIL_MESA
|
|
UNSIGNED_SHORT_8_24_REV_MESA ushort 2 DEPTH_STENCIL_MESA
|
|
|
|
UNSIGNED_INT_8_24:
|
|
|
|
31 30 29 28 27 26 25 24 23 22 21 20 19 18 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1 0
|
|
+-----------------------+-----------------------------------------------------------------------+
|
|
| | |
|
|
+-----------------------+-----------------------------------------------------------------------+
|
|
|
|
first second
|
|
element element
|
|
|
|
|
|
UNSIGNED_INT_24_8:
|
|
|
|
31 30 29 28 27 26 25 24 23 22 21 20 19 18 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1 0
|
|
+----------------------------------------------------------------------+------------------------+
|
|
| | |
|
|
+----------------------------------------------------------------------+------------------------+
|
|
|
|
first second
|
|
element element
|
|
|
|
UNSIGNED_SHORT_15_1:
|
|
|
|
15 14 13 12 11 10 9 8 7 6 5 4 3 2 1 0
|
|
+-----------------------------------------------------------+---+
|
|
| | |
|
|
+-----------------------------------------------------------+---+
|
|
|
|
first second
|
|
element element
|
|
|
|
|
|
UNSIGNED_SHORT_1_15_REV:
|
|
|
|
15 14 13 12 11 10 9 8 7 6 5 4 3 2 1 0
|
|
+---+-----------------------------------------------------------+
|
|
| | |
|
|
+---+-----------------------------------------------------------+
|
|
|
|
second first
|
|
element element
|
|
|
|
The assignment of elements to fields in the packed pixel is as
|
|
described in the table below:
|
|
|
|
First Second Third Fourth
|
|
Format Element Element Element Element
|
|
------ ------- ------- ------- -------
|
|
RGB red green blue
|
|
RGBA red green blue alpha
|
|
BGRA blue green red alpha
|
|
ABGR_EXT alpha blue green red
|
|
CMYK_EXT cyan magenta yellow black
|
|
DEPTH_STENCIL_MESA depth stencil
|
|
|
|
Additions to Chapter 4 of the 1.1 Specification (Per-Fragment Operations
|
|
and the Frame Buffer)
|
|
|
|
The new format is added to the discussion of Obtaining Pixels from the
|
|
Framebuffer. It should read " If the <format> is one of RED, GREEN,
|
|
BLUE, ALPHA, RGB, RGBA, ABGR_EXT, LUMINANCE, or LUMINANCE_ALPHA, and
|
|
the GL is in color index mode, then the color index is obtained."
|
|
|
|
The new format is added to the discussion of Index Lookup. It should
|
|
read "If <format> is one of RED, GREEN, BLUE, ALPHA, RGB, RGBA,
|
|
ABGR_EXT, LUMINANCE, or LUMINANCE_ALPHA, then the index is used to
|
|
reference 4 tables of color components: PIXEL_MAP_I_TO_R,
|
|
PIXEL_MAP_I_TO_G, PIXEL_MAP_I_TO_B, and PIXEL_MAP_I_TO_A."
|
|
|
|
|
|
Additions to Chapter 5 of the 1.1 Specification (Special Functions)
|
|
|
|
None
|
|
|
|
Additions to Chapter 6 of the 1.1 Specification (State and State Requests)
|
|
|
|
None
|
|
|
|
Additions to the GLX Specification
|
|
|
|
None
|
|
|
|
GLX Protocol
|
|
|
|
TBD
|
|
|
|
Errors
|
|
|
|
None
|
|
|
|
New State
|
|
|
|
None
|
|
|
|
Revision History
|
|
|
|
Version 1.0 - 23 Sep 2000
|
|
Keith's original version.
|
|
|
|
Version 1.1 - 3 Nov 2000
|
|
Brian's edits, assigned values to new enums.
|
|
|