Brian Paul
e97681c7f5
mesa: merge gallium-0.2 into gallium-master-merge
...
Merge commit 'origin/gallium-0.2' into gallium-master-merge
Conflicts:
Makefile
docs/relnotes-7.4.html
docs/relnotes.html
src/mesa/drivers/dri/i965/brw_wm.h
src/mesa/main/imports.c
src/mesa/main/mtypes.h
src/mesa/main/texcompress.c
src/mesa/main/texenvprogram.c
src/mesa/main/version.h
src/mesa/vbo/vbo_exec_api.c
src/mesa/vbo/vbo_save_draw.c
2009-02-09 09:22:22 -07:00
Brian
c6423132ff
mesa: remove remnant of GL_SGIX_depth_texture
2009-01-31 12:11:28 -07:00
Ian Romanick
8aa209c766
Make GL_ARB_draw_buffers mandatory
...
Signed-off-by: Ian Romanick <ian.d.romanick@intel.com >
2009-01-28 16:28:11 -08:00
Ian Romanick
474cda6fa9
Make GL_{EXT,SUN}_multi_draw_arrays and GL_IBM_multimode_draw_arrays mandatory
...
Signed-off-by: Ian Romanick <ian.d.romanick@intel.com >
2009-01-28 16:28:11 -08:00
Ian Romanick
82b9661894
Make GL_ARB_vertex_buffer_object mandatory
...
Signed-off-by: Ian Romanick <ian.d.romanick@intel.com >
2009-01-28 16:28:10 -08:00
Ian Romanick
2b77b1d62e
Make GL_ARB_multisample mandatory
...
Signed-off-by: Ian Romanick <ian.d.romanick@intel.com >
2009-01-28 16:28:10 -08:00
Ian Romanick
33fa5e4bfa
Make GL_ARB_texture_compression mandatory
...
Signed-off-by: Ian Romanick <ian.d.romanick@intel.com >
2009-01-28 16:28:10 -08:00
Brian Paul
26da28c995
mesa: remove GL_SGIX_shadow, GL_SGIX_shadow_ambient and GL_SGIX_depth_texture
...
Everyone should be using the newer/better ARB versions of these extensions.
2009-01-28 16:49:28 -07:00
Brian Paul
54c62ba5c3
mesa: implement texture swizzling in swrast
...
And enable GL_EXT_texture_swizzle for software drivers.
2009-01-28 10:31:05 -07:00
Brian Paul
4a89e51c5f
mesa: set/get new state for GL_EXT_texture_swizzle
2009-01-28 10:27:33 -07:00
Brian Paul
d4757cd02a
mesa: enable GL_NV_texture_env_combine4 for sw drivers
2009-01-23 17:32:32 -07:00
Brian Paul
f5d3027c0a
mesa: initial changes for GL_NV_texture_env_combine4
2009-01-23 17:29:26 -07:00
Brian Paul
b8fc605cdb
Merge branch 'vertex_array_bgra'
2009-01-23 11:29:05 -07:00
Brian Paul
0bd6d48bce
mesa: enable GL_EXT_vertex_array_bgra for sw drivers
2009-01-23 11:26:51 -07:00
Brian Paul
f7c1a2dacd
mesa: initial bits for GL_EXT_vertex_array_bgra
2009-01-23 11:23:12 -07:00
Ian Romanick
b5fbdef7ec
swrast: Enable GL_EXT_stencil_two_side
2009-01-23 09:49:29 -08:00
Brian Paul
1b199101ff
mesa: enable ARB_fbo for s/w drivers
2009-01-22 15:22:08 -07:00
Brian Paul
7d98f5ab6e
mesa: initial extension bits for GL_ARB_framebuffer_object
2009-01-22 15:04:11 -07:00
Alan Hourihane
33a1f495d4
Merge commit 'origin/master' into gallium-0.2
...
Conflicts:
progs/glsl/Makefile
2008-12-08 14:29:50 +00:00
Brian Paul
166d5ac170
mesa: enable texture compression extensions for software drivers when possible
2008-11-28 14:08:04 -07:00
Keith Whitwell
3a3801c143
Merge commit 'origin/master' into gallium-0.2
...
Conflicts:
src/mesa/glapi/descrip.mms
src/mesa/shader/grammar/descrip.mms
2008-10-10 15:26:28 +01:00
Ian Romanick
4741dbcbbc
Unify ARB_depth_texture and SGIX_depth_texture
...
The ARB extension is a superset of the older SGIX extension. Any
hardware that can support the SGIX version can also support the ARB
version. In Mesa, any driver that supports one also supports the
other. This unification just simplifies some bits of code.
2008-10-01 20:38:10 -07:00
Alan Hourihane
47ad296a18
Merge branch 'master' of git+ssh://git.freedesktop.org/git/mesa/mesa into gallium-0.2
...
Conflicts:
src/mesa/drivers/dri/i915/intel_ioctl.c
src/mesa/main/texstore.c
src/mesa/tnl/t_vp_build.c
src/mesa/vbo/vbo_exec_draw.c
2008-09-11 17:32:18 +01:00
Keith Whitwell
0397b2bb41
Merge branch 'gallium-0.1' into gallium-0.2
...
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
2008-09-11 16:05:15 +01:00
Brian Paul
bafefccff8
mesa: don't check for GLSL 1.2 to advertise GL 2.1
...
The GLSL 1.2 features are minor...
2008-08-26 16:13:39 -06:00
Brian Paul
44c7f37b44
disable GL_ARB_shading_language_120 until 1.20 features are complete
2008-07-29 07:47:56 -06:00
Brian
c6499a741c
Determine GL extensions/limits by making pipe queries.
...
The state tracker calls pipe->get_param() to determine the GL limits and
which OpenGL extensions are supported.
This is an initial implementation that'll probably change...
2007-11-05 18:04:30 -07:00
Brian
6775c1e8cc
Remove test for EXT_blend_logic_op in glGetString when determining GL version.
...
EXT_blend_logic_op is slightly different from GL 1.1's RGBA logicop mode
and does not have to be supported. Per conversation with Roland.
2007-09-28 16:06:43 -06:00
Ian Romanick
7b559a9102
Add support for GL_ARB_fragment_program_shadow.
2007-06-07 13:58:50 -07:00
Ian Romanick
bb372f1c9b
Initial implementation of MESA_texture_array
...
Shadow sampling from texture arrays is still not implemented. Everything
else should be there, though.
2007-05-16 15:34:22 -07:00
Brian
af807a4696
enable GLSL 1.20
2007-04-08 21:48:19 -06:00
Keith Whitwell
6a3fdc3a1e
Merge branch 'master' of git+ssh://keithw@git.freedesktop.org/git/mesa/mesa into vbo-0.2
...
Conflicts:
src/mesa/array_cache/sources
src/mesa/drivers/dri/i965/brw_context.c
src/mesa/drivers/dri/i965/brw_draw.c
src/mesa/drivers/dri/i965/brw_fallback.c
src/mesa/drivers/dri/i965/brw_vs_emit.c
src/mesa/drivers/dri/i965/brw_vs_tnl.c
src/mesa/drivers/dri/mach64/mach64_context.c
src/mesa/main/extensions.c
src/mesa/main/getstring.c
src/mesa/tnl/sources
src/mesa/tnl/t_save_api.c
src/mesa/tnl/t_save_playback.c
src/mesa/tnl/t_vtx_api.c
src/mesa/tnl/t_vtx_exec.c
src/mesa/vbo/vbo_attrib.h
src/mesa/vbo/vbo_exec_api.c
src/mesa/vbo/vbo_save_api.c
src/mesa/vbo/vbo_save_draw.c
2007-01-16 11:22:57 +00:00
Brian
8dcfcad7a2
Move all the code for computing ctx->_TriangleCaps into state.c.
...
ctx->_TriangleCaps should probably go away altogether someday...
2006-12-13 15:31:14 -07:00
Brian Paul
61fd687c74
Minor changes to get ready for OpenGL 2.1.
2006-11-03 15:18:17 +00:00
Brian Paul
e812081253
Undo some of yesterday's ATI_separate_stencil changes. The ATI extension
...
doesn't exactly match OpenGL 2.0.
2006-11-02 22:39:29 +00:00
Alan Hourihane
6d104cb932
merge current trunk into vbo branch
2006-11-02 12:02:13 +00:00
Brian Paul
467c773f79
Add ATI_separate_stencil and use it in preference to EXT_stencil_two_side
...
since the former is what's used for OpenGL 2.0.
2006-11-02 00:41:40 +00:00
Ian Romanick
8c41c757fe
Add support for GL_EXT_gpu_program_parameters. Any driver that enables
...
either GL_ARB_vertex_program or GL_ARB_fragment_program should enable this
extension as well.
2006-08-15 16:47:34 +00:00
Brian Paul
8d214bc804
Initial work for GL_EXT_texture_sRGB.
2006-08-03 03:20:52 +00:00
Ian Romanick
ee34e6ef71
Add support for GL_APPLE_vertex_array_object. Several test programs
...
and demos are also added.
Adding basic support to drivers should be as easy as just enabling the
extension, though thorough test would also be required.
2006-06-12 16:26:29 +00:00
Brian Paul
255e8ebd58
enable GL_ARB_half_float_pixel, was GL_MESAX_half_float_pixel
2006-03-28 01:23:43 +00:00
Brian Paul
daffbe99dc
GL_EXT_packed_depth_stencil should be off by default
2006-03-21 21:57:00 +00:00
Brian Paul
904ab0c22c
check FEATURE_EXT_framebuffer_blit
2006-03-02 03:46:33 +00:00
Michal Krol
0c8e578a38
Enable GL_ARB_fragment_shader extension.
2006-02-15 11:00:15 +00:00
Michal Krol
2363fff347
Enable GL_ARB_shader_objects, GL_ARB_shading_language_100 and
...
GL_ARB_vertex_shader extensions.
2006-02-13 11:04:27 +00:00
Brian Paul
1add059bd1
Removed the GL_SGIX/SGIS_pixel_texture extensions. Same thing can be
...
done with fragment programs nowadays.
2005-12-14 03:04:58 +00:00
Brian Paul
0bffb1192a
some initial work on upcoming GL_EXT_framebuffer_blit extension
2005-11-08 14:45:48 +00:00
Brian Paul
1ad7b99925
Initial work for GL_EXT_packed_depth_stencil extension.
...
glReadPixels done, glDrawPixels mostly done.
2005-09-28 02:29:50 +00:00
Brian Paul
42c34efd23
OpenGL 2.0's two-sided stencil feature wasn't implemented correctly.
...
See comment near top of stencil.c for info about OpenGL 2.0 vs.
GL_EXT_stencil_two_side.
2005-09-13 02:59:53 +00:00
Brian Paul
4fb995084e
Prototype implementation of new GL_EXT_timer_query extension (not finalized yet).
...
Extends the query mechanism to query elapsed time while rendering.
2005-09-02 13:42:49 +00:00