Roland Scheidegger
114152e068
mesa: add support for ATI_envmap_bumpmap
...
add new entrypoints, new texture format, etc
translate in texenvprogram.c for drivers using the mesa-generated tex env
fragment program
also handled in swrast, but not tested (cannot work due to negative texel
results not handled correctly)
2009-03-12 15:01:16 +01:00
Brian Paul
9705cff203
mesa: re-org texgen state
...
New gl_texgen struct allows quite a bit of code reduction.
2009-02-21 13:23:04 -07:00
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 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
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
ec17001cd4
mesa: fix default switch case in append_token(), see bug 18734
2008-11-28 13:50:41 -07:00
Alan Hourihane
c4c86bbd16
Merge commit 'origin/master' into gallium-0.2
2008-11-28 16:19:10 +00:00
Brian Paul
c303e7299b
mesa: remove an assertion (see bug 18734)
2008-11-27 11:01:30 -07:00
Brian Paul
11701b4c15
mesa: add some missing switch cases for generating state var strings
2008-11-26 07:21:12 -07:00
Keith Whitwell
d7f1cb5b5a
Merge commit 'origin/gallium-0.1' into gallium-0.2
...
Conflicts:
src/gallium/auxiliary/gallivm/instructionssoa.cpp
src/gallium/auxiliary/gallivm/soabuiltins.c
src/gallium/auxiliary/rtasm/rtasm_x86sse.c
src/gallium/auxiliary/rtasm/rtasm_x86sse.h
src/mesa/main/texenvprogram.c
src/mesa/shader/arbprogparse.c
src/mesa/shader/prog_statevars.c
src/mesa/state_tracker/st_draw.c
src/mesa/vbo/vbo_exec_draw.c
2008-10-10 15:23:36 +01:00
Keith Whitwell
fa1b533012
mesa: add new internal state for tracking current vertex attribs
2008-10-03 16:49:52 +01:00
Keith Whitwell
0e008d3797
mesa: add missing state dependencies for various tracked constants
2008-10-03 13:53:07 +01:00
José Fonseca
452a592ca4
mesa: Apply MSVC portability fixes from Alan Hourihane.
2008-09-23 17:20:38 -07:00
Brian Paul
facfb44d37
mesa: remove unneeded #include
...
(cherry picked from commit 6363960db5
2008-09-21 22:13:54 -07:00
Keith Whitwell
32ef6e7583
mesa: move fixed function vertex program builder from tnl to core mesa
...
Also unify caching of fragment and vertex programs in shader/prog_cache.c`
Brought across from gallium-0.2
2008-09-21 09:46:00 -07:00
Brian Paul
bbd287103d
mesa: prefix a bunch of #include lines with "main/".
...
This is another step toward removing a whole bunch of -I flags from
the cc commands. Still need to address driver code...
2008-09-18 12:26:54 -06:00
Keith Whitwell
cc7dd4fc1b
Merge commit 'origin/gallium-0.1' into gallium-0.2
...
Conflicts:
Makefile
progs/demos/Makefile
progs/glsl/Makefile
progs/redbook/Makefile
progs/samples/Makefile
progs/tests/Makefile
progs/trivial/Makefile
progs/xdemos/Makefile
src/gallium/Makefile
src/mesa/main/attrib.c
src/mesa/main/bufferobj.c
src/mesa/vbo/vbo_exec_draw.c
2008-09-11 18:32:05 +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
Michal Krol
ce3cf63251
mesa: _mesa_program_state_string() returns char *, not const char *.
2008-09-05 12:25:50 +02:00
Brian Paul
016701f686
mesa: Silence compiler warnings on Windows.
2008-07-29 17:43:35 -06:00
Nicolai Haehnle
c117d0efd2
r300: Implement ARB_shadow_ambient; add STATE_SHADOW_AMBIENT
2008-07-27 21:31:49 +02:00
José Fonseca
101d1a658a
mesa: Prefix main includes with dir to avoid conflicts.
...
Some of the headers in src/mesa/main have pretty common names which
easily conflict with third-party code, e.g. config.h
2008-07-24 21:24:10 +09:00
Michal Krol
f9c574d719
mesa: Silence compiler warnings on Windows.
2008-07-15 11:49:02 +02:00
Brian Paul
6363960db5
mesa: remove unneeded #include
2008-06-12 16:58:04 -06:00
José Fonseca
53174afeeb
mesa: Apply MSVC portability fixes from Alan Hourihane.
2008-05-31 18:55:40 +09:00
Keith Whitwell
e1590abb17
mesa: pre-swizzle normal scale state value
2008-05-24 13:23:06 +01:00
Keith Whitwell
adc1f88fc9
mesa: do object-space lighting in ffvertex_prog.c
...
Start pulling over some of the optimizations from the fixed function
paths.
2008-05-23 09:16:58 +01:00
Brian Paul
88c0a74633
additional fog/color matrix changes from gallium-0.1
2008-05-18 15:55:24 -06:00
Brian Paul
6e92968d75
add state vars for color matrix, pixel transfer scale&bias
...
cherry-picked from gallium-0.1 (068c7bd912
2008-05-18 15:52:13 -06:00
Brian Paul
2f8fc325ac
mesa: added internal post color matrix scale/bias vars
...
cherry-picked from gallium-0.1 (302daeb2ec
2008-05-18 15:50:20 -06:00
Brian Paul
5976a6a75c
added div by zero check for Fog.End/Start (from gallium-0.1)
2008-05-18 15:41:36 -06:00
Brian Paul
1036ec94e5
Fix some bugs in material, depth range state
...
picked from master
2008-05-18 15:32:58 -06:00
Brian Paul
ba47aabc98
gallium: fix potential divide by zero in fog computation
...
It's legal for Fog.Start == Fog.End and conformance testing does so.
2008-04-23 11:38:41 -06:00
Alan Hourihane
b3efd35f4b
revert part of the previous cleanup - it only applies
...
to the 7.0 branch
2008-04-22 23:05:11 +01:00
Alan Hourihane
c8666cfb0b
correct the return value
2008-04-22 20:31:58 +01:00
Brian Paul
302daeb2ec
mesa: added internal post color matrix scale/bias vars
2008-04-16 16:53:43 -06:00
Roland Scheidegger
142fcd3a13
fix state.lightprod ambient/specular w value (bug #14983 )
2008-03-13 12:43:04 +01:00
Roland Scheidegger
642d5ee8c5
state.depth.range alpha value should be 1, not 0 (bug #14733 )
2008-03-01 02:56:08 +01:00
Brian
a7e1b4456a
Move _mesa_load_tracked_matrices() from TNL module to prog_statevars.c
2007-11-29 08:13:16 -07:00
Brian
0abd1fca91
more additions for COLOR_MATRIX, etc
2007-10-30 13:53:38 -06:00
Brian
068c7bd912
add state vars for color matrix, pixel transfer scale&bias
2007-10-30 12:39:58 -06:00
Brian
52111366cc
disable the NeedFlush assertion for now
2007-10-17 16:19:10 -06:00
Brian
420c062cb6
Assert that there's no outstanding current state that needs to be flushed from the vbo in _mesa_load_state_parameters().
...
Several of the state parameters use current state (such as materials).
Need to make sure those values are not stale.
2007-10-17 15:59:59 -06:00
Brian
f05c76ec1a
remove unneeded cast
2007-10-11 10:33:31 -06:00
Roland Scheidegger
7f1879d4e1
make sure optimized fog params get updated
2007-05-22 03:32:25 +02:00
Brian
4fca6bfa5d
fix STATE_HALF_VECTOR value (bug 10987)
2007-05-18 07:46:27 -06:00
Brian
fb3f0beb42
update comments
2007-03-07 17:37:24 -07:00
Brian
fbc4929185
add missing code for newer STATE_INTERNAL items
2007-02-24 17:00:50 -07:00
Brian
a2786a97d7
add some missing cases in _mesa_program_state_string()
2007-02-23 17:13:30 -07:00
Brian
ef0cc9db54
remove dead code
2007-02-23 11:43:14 -07:00
