58 Commits

Author	SHA1	Message	Date
Brian Paul	7dd6fa12e1	progs/util: minor updates to glutskel.c	2009-08-30 09:10:36 -06:00
Brian Paul	fa6299cb31	progs/util: added ValidateShaderProgram() to shaderutil.c	2009-08-25 17:46:10 -06:00
Brian Paul	f300db379e	progs/util: added GetShaderCompile/LinkTime() to get compilation/link times	2009-08-20 14:43:32 -06:00
Brian Paul	741869d73a	progs/util: ignore pre-defined uniforms in SetUniformValues()	2009-08-13 12:53:20 -06:00
Brian Paul	fdfb0d4b0e	progs/glsl: change uniform_info::type field to use GLSL vector types	2009-08-12 17:28:45 -06:00
Brian Paul	684049d97d	demos: rename InitUniforms() to SetUniformValues() ... And call new PrintUniforms() in demos.	2009-08-12 17:28:45 -06:00
Brian Paul	378bff0edd	progs/util: added more shader utility functions	2009-08-12 17:28:45 -06:00
Brian Paul	b96ae1b2c4	Merge branch 'mesa_7_5_branch' ... Conflicts: Makefile progs/glsl/multitex.c src/mesa/main/enums.c src/mesa/main/state.c src/mesa/main/texenvprogram.c src/mesa/main/version.h	2009-07-17 22:00:47 -06:00
Brian Paul	cd10996d4f	progs/util: remove extfuncs.h (we use GLEW instead)	2009-07-17 14:43:29 -06:00
Brian Paul	b40dc7e7fc	Merge branch 'mesa_7_5_branch' ... Conflicts: src/mesa/vbo/vbo_exec_draw.c	2009-06-30 08:56:53 -06:00
Keith Whitwell	14a2b5445a	progs/util: make sure function pointers are initialized ... Call Init() from CompileShaderFile, was previously only called for the Text version of this function.	2009-06-30 15:41:43 +01:00
Thomas Hellstrom	f5888d9ca5	Merge branch 'mesa_7_5_branch' ... Conflicts: progs/util/extfuncs.h	2009-06-15 11:43:48 +02:00
Brian Paul	476685c63c	util: additional function pointers	2009-06-12 08:15:33 -06:00
Brian Paul	96370113f1	demos/util: add funcs for GL_ARB_buffer_object	2009-05-22 13:12:01 -06:00
José Fonseca	e5a3aa5672	progs: Try to read the texture from the current dir, if full path fails.	2009-03-16 12:01:44 +00: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	4c5f390328	util: added more functions to extfuncs.h	2009-02-02 16:51:45 -07:00
José Fonseca	9aa73cfae8	progs: Get more samples building on windows.	2009-02-01 12:00:17 +00:00
Brian Paul	7d41f10605	util: check for frag/vertShader=0 before attaching	2008-12-18 14:17:06 -07:00
Brian Paul	637f06dcdc	util: check for frag/vertShader=0 before attaching	2008-12-17 13:58:05 -07:00
Alan Hourihane	2382dc8aff	Merge commit 'origin/master' into gallium-0.2	2008-11-05 11:59:12 +00:00
Brian Paul	35a9f1bccf	print err msg if unable to open shader file	2008-11-04 16:55:18 -07:00
Keith Whitwell	45efcc44c7	Remove CVS keywords. ... Cherry-picked from gallium-0.1 Conflicts: src/glu/sgi/libnurbs/interface/bezierEval.h src/glu/sgi/libnurbs/interface/bezierPatch.h src/glu/sgi/libnurbs/interface/bezierPatchMesh.h src/glu/sgi/libnurbs/internals/dataTransform.h src/glu/sgi/libnurbs/internals/displaymode.h src/glu/sgi/libnurbs/internals/sorter.h src/glu/sgi/libnurbs/nurbtess/definitions.h src/glu/sgi/libnurbs/nurbtess/directedLine.h src/glu/sgi/libnurbs/nurbtess/gridWrap.h src/glu/sgi/libnurbs/nurbtess/monoChain.h src/glu/sgi/libnurbs/nurbtess/monoPolyPart.h src/glu/sgi/libnurbs/nurbtess/monoTriangulation.h src/glu/sgi/libnurbs/nurbtess/partitionX.h src/glu/sgi/libnurbs/nurbtess/partitionY.h src/glu/sgi/libnurbs/nurbtess/polyDBG.h src/glu/sgi/libnurbs/nurbtess/polyUtil.h src/glu/sgi/libnurbs/nurbtess/primitiveStream.h src/glu/sgi/libnurbs/nurbtess/quicksort.h src/glu/sgi/libnurbs/nurbtess/rectBlock.h src/glu/sgi/libnurbs/nurbtess/sampleComp.h src/glu/sgi/libnurbs/nurbtess/sampleCompBot.h src/glu/sgi/libnurbs/nurbtess/sampleCompRight.h src/glu/sgi/libnurbs/nurbtess/sampleCompTop.h src/glu/sgi/libnurbs/nurbtess/sampleMonoPoly.h src/glu/sgi/libnurbs/nurbtess/sampledLine.h src/glu/sgi/libnurbs/nurbtess/searchTree.h src/glu/sgi/libnurbs/nurbtess/zlassert.h src/glu/sgi/libutil/error.c src/glu/sgi/libutil/glue.c src/glu/sgi/libutil/gluint.h src/glu/sgi/libutil/project.c src/glu/sgi/libutil/registry.c src/glx/x11/glxclient.h src/glx/x11/glxext.c src/mesa/drivers/dri/ffb/ffb_dd.h src/mesa/drivers/dri/ffb/ffb_points.h src/mesa/drivers/dri/gamma/gamma_context.h src/mesa/drivers/dri/gamma/gamma_macros.h src/mesa/drivers/dri/i810/i810context.h src/mesa/drivers/dri/r128/r128_dd.h src/mesa/drivers/dri/tdfx/tdfx_dd.h	2008-09-21 11:00:44 -07: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
Corbin Simpson	567d87744a	added test for ARB GLSL extensions	2008-08-16 11:07:51 -06:00
José Fonseca	77ce568ff7	Remove CVS keywords.	2008-05-26 20:14:40 +09:00
Brian Paul	e1c3560152	add missing glViewport calls ... cherry-picked from master	2008-04-11 09:01:04 -06:00
Brian Paul	b69eb0360a	add missing glViewport calls	2008-04-11 08:59:39 -06:00
Brian	90caba3d76	shader utility functions	2008-04-09 22:30:42 -06:00
Brian	c3240b5ff8	added glGetActiveUniform_func	2008-04-04 19:28:33 -06:00
Brian	f7f4b81ad8	mesa: added more ext funcs (from Mesa/master)	2008-04-04 18:55:48 -06:00
José Fonseca	2d38d1b300	Remove files of unsupported build systems.	2008-02-25 17:11:28 +09:00
Brian	6c0fc07d71	fix glUniform4f typo	2008-01-01 10:20:56 -07:00
Brian	88f1419f96	added glSecondaryColor3fv_func	2007-12-18 16:30:42 -07:00
Michal Krol	918ea5168b	Rename 'mms-config.' to 'mms.config'. ... It looks like Windows does not like filenames ending with a dot, in effect renaming it to 'mms-config'.	2007-10-29 19:50:10 +00:00
Brian	e5213be78e	added a few more functions	2007-07-29 18:28:46 -06:00
Brian	02e958a1e4	added glGetActiveAttrib	2007-04-27 16:27:36 -06:00
Brian	0d3d930912	add 2.1 functions	2007-04-08 15:41:02 -06:00
Brian	8f3fc5221c	added glActiveStencilFaceEXT	2007-04-07 08:38:36 -06:00
Brian	9d0ae967d4	added some VerteAttrib funcs	2007-01-16 14:57:12 -07:00
Brian	64414ea0e9	added glUniform1fv_func, glUniform2fv_func	2007-01-13 14:51:02 -07:00
Brian	cc858bfa84	added a few more 2.0 functions	2007-01-09 17:49:53 -07:00
Brian	7b4d10b4a3	added glUniform1i_func	2007-01-04 14:40:56 -07:00
Brian	1ff1e89ff4	added glUniformMatrix2/3fv_func	2006-12-20 17:56:29 -07:00
Brian	e55b771a1e	simple extension function wrangler	2006-12-15 09:30:31 -07:00
Brian Paul	59cfd3cd3f	destroy window upon exit, remove CVS log comment	2006-07-12 02:34:43 +00:00
Brian Paul	9671548424	virtual trackball code	2006-06-26 22:59:28 +00:00
Brian Paul	111281f1fc	s/malloc/calloc/, fix mem leak	2006-01-31 03:00:14 +00:00
Jouk Jansen	d997b90433	Committing in . ... 1) change compilation on VMS to use IEEE floating points 2) one more problem with _mesa_sprintf solved Modified Files: Mesa/docs/README.VMS Mesa/progs/demos/descrip.mms Mesa/progs/tests/descrip.mms Mesa/progs/util/descrip.mms Mesa/progs/xdemos/descrip.mms Mesa/src/glu/mesa/descrip.mms Mesa/src/glu/sgi/descrip.mms Mesa/src/glut/glx/descrip.mms Mesa/src/mesa/array_cache/descrip.mms Mesa/src/mesa/drivers/common/descrip.mms Mesa/src/mesa/drivers/osmesa/descrip.mms Mesa/src/mesa/drivers/x11/descrip.mms Mesa/src/mesa/glapi/descrip.mms Mesa/src/mesa/main/descrip.mms Mesa/src/mesa/main/texobj.c Mesa/src/mesa/math/descrip.mms Mesa/src/mesa/shader/descrip.mms Mesa/src/mesa/shader/grammar/descrip.mms Mesa/src/mesa/shader/slang/descrip.mms Mesa/src/mesa/swrast/descrip.mms Mesa/src/mesa/swrast_setup/descrip.mms Mesa/src/mesa/tnl/descrip.mms ----------------------------------------------------------------------	2005-09-23 07:03:53 +00:00
Brian Paul	0275d921ac	VMS updates from Jouk Jansen	2005-01-11 15:23:08 +00:00