Michal Krol [Tue, 15 Jul 2008 09:15:27 +0000 (11:15 +0200)]
mesa: Silence compiler warnings on Windows.
Brian Paul [Mon, 14 Jul 2008 17:20:58 +0000 (11:20 -0600)]
mesa: comments about vectors vs components
Brian Paul [Tue, 8 Jul 2008 22:58:50 +0000 (16:58 -0600)]
mesa: remove debug code
Brian Paul [Tue, 8 Jul 2008 22:12:01 +0000 (16:12 -0600)]
mesa: implement glGetUniformiv() with new ctx->Driver function
The old implementation could overwrite the caller's param buffer.
Brian Paul [Thu, 3 Jul 2008 20:12:27 +0000 (14:12 -0600)]
mesa: added case for fixed pt
Brian Paul [Wed, 25 Jun 2008 14:45:14 +0000 (08:45 -0600)]
mesa: point size arrays
José Fonseca [Tue, 24 Jun 2008 05:02:24 +0000 (14:02 +0900)]
mesa: Replace deprecated __MSC__ macro.
José Fonseca [Tue, 24 Jun 2008 04:12:41 +0000 (13:12 +0900)]
mesa: More signed/unsigned float/integer fixes.
José Fonseca [Tue, 24 Jun 2008 02:34:46 +0000 (11:34 +0900)]
mesa: Use appropriate unsigned/signed, float/integer types.
José Fonseca [Tue, 24 Jun 2008 02:33:03 +0000 (11:33 +0900)]
mesa: Use _mesa_bsearch.
José Fonseca [Tue, 24 Jun 2008 01:58:55 +0000 (10:58 +0900)]
mesa: bsearch implementation for WinCE.
José Fonseca [Mon, 23 Jun 2008 17:37:21 +0000 (02:37 +0900)]
mesa: ASSERT macro is already defined by WinCE headers.
Even when just the standard headers are used....
Brian Paul [Fri, 20 Jun 2008 20:29:49 +0000 (14:29 -0600)]
mesa: init ctx->RenderMode
Brian Paul [Fri, 20 Jun 2008 17:49:25 +0000 (11:49 -0600)]
mesa: GL_BYTE vertex/texcoord arrays
Brian Paul [Fri, 20 Jun 2008 17:32:22 +0000 (11:32 -0600)]
mesa: initial support for fixed-pt vertex arrays
Brian Paul [Fri, 20 Jun 2008 17:31:05 +0000 (11:31 -0600)]
mesa: refactor: move initialization of DefaultPacking state.
Brian Paul [Fri, 20 Jun 2008 17:15:30 +0000 (11:15 -0600)]
mesa: fix errors in prev commit
Brian Paul [Fri, 20 Jun 2008 17:05:00 +0000 (11:05 -0600)]
mesa: revamp glBlendFunc loopback
Brian Paul [Fri, 20 Jun 2008 16:47:38 +0000 (10:47 -0600)]
mesa: fix some FEATURE_x tests
Brian Paul [Fri, 20 Jun 2008 14:07:38 +0000 (08:07 -0600)]
mesa: test for FEATURE_ATI_fragment_shader
Brian Paul [Wed, 18 Jun 2008 15:30:13 +0000 (09:30 -0600)]
mesa: fix ReadBuffer initialization
Brian Paul [Tue, 17 Jun 2008 22:56:32 +0000 (16:56 -0600)]
mesa: FEATURE_dispatch to control dispatch table usage
Brian Paul [Fri, 13 Jun 2008 22:45:15 +0000 (16:45 -0600)]
mesa: move some glapi bits around
Move _glapi_proc typedef from glapitable.h to glapi.h
Also, don't include glapitable.h from glapi.h
Before we were including the huge glapitable.h file in every .c file.
Brian Paul [Fri, 13 Jun 2008 20:13:25 +0000 (14:13 -0600)]
mesa: remove some temp debug code
Brian Paul [Fri, 13 Jun 2008 19:56:53 +0000 (13:56 -0600)]
mesa: check FEATURE_ARB_occlusion_query
Brian Paul [Fri, 13 Jun 2008 15:10:09 +0000 (09:10 -0600)]
mesa: fix typo: s/stacks/stack/
Brian [Mon, 11 Feb 2008 16:43:30 +0000 (09:43 -0700)]
code refactoring, new next_mipmap_level_size() function
(cherry picked from commit
c22d9152e33792ea58426c53bc9b96bf552b0b44)
Brian [Mon, 11 Feb 2008 16:33:28 +0000 (09:33 -0700)]
added _mesa_tex_target_to_face()
(cherry picked from commit
b52ce6341f877a0a1cfd3c50c07eeb1c156ae89e)
Brian [Fri, 8 Feb 2008 23:56:21 +0000 (16:56 -0700)]
refactor code, export _mesa_generate_mipmap_level()
Brian [Fri, 8 Feb 2008 23:46:12 +0000 (16:46 -0700)]
move _mesa_format_to_type_and_comps() to texformat.c
(cherry picked from commit
42eac65da45fb58bffdf94ab8f9860d8cee5b256)
Keith Whitwell [Mon, 22 Sep 2008 03:09:31 +0000 (20:09 -0700)]
mesa: pull in mipmap.c changes from gallium-0.2
Brian Paul [Thu, 12 Jun 2008 22:48:24 +0000 (16:48 -0600)]
mesa: remove unneeded #include
(cherry picked from commit
6363960db55769db73021081b60f1028723d9f58)
Brian Paul [Thu, 12 Jun 2008 02:13:07 +0000 (20:13 -0600)]
mesa: refactor: move various ENUM_TO_x macros into macros.h
Brian Paul [Thu, 12 Jun 2008 02:05:53 +0000 (20:05 -0600)]
mesa: refactor: move glTexParameter-related functions into new texparam.c file
Brian Paul [Thu, 12 Jun 2008 01:58:30 +0000 (19:58 -0600)]
mesa: refactor: move glTexEnv-related functions into new texenv.c file
(cherry picked from commit
7ecac78ab53016ae3db3dd601b187cb050037463)
Brian Paul [Thu, 12 Jun 2008 01:48:01 +0000 (19:48 -0600)]
mesa: refactor: move glTexGen-related functions into new texgen.c file
(cherry picked from commit
27049189d6221fefe43eb55846efaa51742dcdf4)
Brian Paul [Tue, 10 Jun 2008 22:43:49 +0000 (16:43 -0600)]
mesa: refactor: fix some FEATURE_ typos, mistakes
(cherry picked from commit
e4cfe0854ad968193106048179b9b52ec1768f41)
Keith Whitwell [Mon, 22 Sep 2008 02:29:15 +0000 (19:29 -0700)]
mesa: refactor: move #define FEATURE flags into new mfeatures.h file
Also, check the FEATURE flags in many places.
(cherry picked from commit
40d1a40f294f1ed2dacfad6f5498322fc08cc2d1)
Conflicts:
src/mesa/main/config.h
src/mesa/main/context.c
src/mesa/main/texobj.c
src/mesa/main/texstate.c
src/mesa/main/texstore.c
Brian Paul [Mon, 9 Jun 2008 21:14:02 +0000 (15:14 -0600)]
mesa: refactor: move _mesa_update_minmax/histogram() into image.c
(cherry picked from commit
eded7f010d344a909cf9c403eb3bdad91804d174)
Brian Paul [Mon, 9 Jun 2008 21:09:21 +0000 (15:09 -0600)]
mesa: refactor: move multisample-related functions into new multisample.c file
Brian Paul [Mon, 9 Jun 2008 21:04:31 +0000 (15:04 -0600)]
mesa: refactor: move _mesa_resizebuffers(), _mesa_ResizeBuffersMESA() to framebuffer.c
(cherry picked from commit
9091015a9782ad15e58540a8fd61df83ea2bfe31)
Brian Paul [Mon, 9 Jun 2008 21:01:02 +0000 (15:01 -0600)]
mesa: refactor: move glClear, glClearColor into new clear.c file.
Brian Paul [Mon, 9 Jun 2008 20:55:24 +0000 (14:55 -0600)]
mesa: refactor: move scissor functions into new scissor.c file
(cherry picked from commit
4be7296bfcba22a849f949d105ea385e6964cc25)
Brian Paul [Mon, 9 Jun 2008 20:32:27 +0000 (14:32 -0600)]
mesa: refactor: move pixel map/scale/bias code into image.c
pixel.c is just the API-related code now.
Brian Paul [Mon, 9 Jun 2008 20:25:23 +0000 (14:25 -0600)]
mesa: refactor: new _mesa_init_pixelstore() function
(cherry picked from commit
5f91007f996d0b7e3233f221a6b0056203e356d2)
Brian Paul [Mon, 9 Jun 2008 20:49:04 +0000 (14:49 -0600)]
mesa: refactor: move _mesa_init_exec_table() into new api_exec.c file
(cherry picked from commit
b36e6f0baf64491772b8e1a1cddf68a7dcf8ee22)
Brian Paul [Mon, 9 Jun 2008 20:22:15 +0000 (14:22 -0600)]
mesa: refactor: move glReadPixels code into new readpix.c file
Brian [Wed, 17 Oct 2007 22:18:45 +0000 (16:18 -0600)]
Add some FLUSH_CURRENT() calls.
Without these we can find ourselves in _mesa_load_state_parameters()
computing derived lighting/material values whhen the current material
properties haven't been updated from the VBO.
This may be a somewhat wide-spread problem that needs more attention...
(cherry picked from commit
49adf51eeec31c9f3c995a70acc5008522689708)
Brian Paul [Mon, 9 Jun 2008 20:14:34 +0000 (14:14 -0600)]
mesa: refactor: move glPixelStore function into new pixelstore.c file
Brian Paul [Thu, 5 Jun 2008 18:08:19 +0000 (12:08 -0600)]
mesa: remove EXT/NV suffixes from _mesa_PointParameter functions
José Fonseca [Thu, 7 Aug 2008 08:03:30 +0000 (09:03 +0100)]
glut: Remove EOF characters.
Benjamin Close [Mon, 22 Sep 2008 02:29:30 +0000 (11:59 +0930)]
i965: fix compilation
Found By: Tinderbox
Chris Rankin [Sun, 21 Sep 2008 21:56:17 +0000 (23:56 +0200)]
Fix X86 compilation.
Keith Whitwell [Sun, 21 Sep 2008 18:00:44 +0000 (11:00 -0700)]
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
José Fonseca [Wed, 23 Jul 2008 12:06:01 +0000 (21:06 +0900)]
mesa: Prefix main includes with dir to avoid conflicts.
Eliminate a couple of differences with gallium-0.2
Keith Whitwell [Fri, 12 Sep 2008 14:03:19 +0000 (15:03 +0100)]
mesa: remove dead file
Keith Whitwell [Fri, 12 Sep 2008 14:02:50 +0000 (15:02 +0100)]
mesa: add explict float casts
Keith Whitwell [Sat, 20 Sep 2008 15:26:11 +0000 (08:26 -0700)]
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
Brian Paul [Tue, 17 Jun 2008 17:29:59 +0000 (11:29 -0600)]
mesa: add parenthesis
(cherry picked from commit
c366fd83b617db6c8c064802ff4bf120d654507d)
Keith Whitwell [Sat, 20 Sep 2008 14:32:30 +0000 (07:32 -0700)]
mesa: standardize on C99's uint*_t instead of u_int*_t
José Fonseca [Wed, 4 Jun 2008 14:55:55 +0000 (23:55 +0900)]
mesa: Remove assyntax.h include from generated matypes.h.
matypes.h doesn't really depend on assyntax.h; assyntax.h is only present
on x86; and this way we remove the need of grep being available (which is
relevant for scons and non-unix platforms).
(cherry picked from commit
fc286ff3ba089af5f1aca2d35b93b53a9383b1cf)
Keith Whitwell [Sat, 20 Sep 2008 13:43:24 +0000 (06:43 -0700)]
mesa: move rastpos helper to tnl
Keith Whitwell [Sat, 20 Sep 2008 13:34:23 +0000 (06:34 -0700)]
mesa: improved driver query interface
Brought over from gallium-0.2 branch.
Adam Jackson [Fri, 19 Sep 2008 21:16:53 +0000 (17:16 -0400)]
Update to SGI FreeB 2.0.
Under the terms of version 1.1, "once Covered Code has been published
under a particular version of the License, Recipient may, for the
duration of the License, continue to use it under the terms of that
version, or choose to use such Covered Code under the terms of any
subsequent version published by SGI."
FreeB 2.0 license refers to "dates of first publication". They are here
taken to be 1991-2000, as noted in the original license text:
** Original Code. The Original Code is: OpenGL Sample Implementation,
** Version 1.2.1, released January 26, 2000, developed by Silicon Graphics,
** Inc. The Original Code is Copyright (c) 1991-2000 Silicon Graphics, Inc.
** Copyright in any portions created by third parties is as indicated
** elsewhere herein. All Rights Reserved.
Official FreeB 2.0 text:
http://oss.sgi.com/projects/FreeB/SGIFreeSWLicB.2.0.pdf
As always, this code has not been tested for conformance with the OpenGL
specification. OpenGL conformance testing is available from
http://khronos.org/ and is required for use of the OpenGL logo in
product advertising and promotion.
Brian [Fri, 19 Sep 2008 03:22:08 +0000 (21:22 -0600)]
glx: re-add glapi/ path
Brian [Fri, 19 Sep 2008 02:31:05 +0000 (20:31 -0600)]
mesa: remove unneeded s_drawpix.h header
Brian [Fri, 19 Sep 2008 02:27:16 +0000 (20:27 -0600)]
glx: added "glapi/" prefix to include
Chris Rankin [Thu, 18 Sep 2008 22:48:11 +0000 (16:48 -0600)]
mesa: fix asst path/include mistakes in prev commits
Brian Paul [Thu, 18 Sep 2008 21:29:57 +0000 (15:29 -0600)]
mesa: fix null ptr deref bug in _tnl_InvalidateState(), bug 15834
Brian Paul [Thu, 18 Sep 2008 21:17:05 +0000 (15:17 -0600)]
mesa: added "main/" prefix to includes, remove some -I paths from Makefile.template
Brian Paul [Thu, 18 Sep 2008 19:46:47 +0000 (13:46 -0600)]
mesa: prefix more #includes with "main/"
Brian Paul [Thu, 18 Sep 2008 19:34:57 +0000 (13:34 -0600)]
mesa: remove a bunch of -I paths from INCLUDE_DIRS
Brian Paul [Thu, 18 Sep 2008 19:26:30 +0000 (13:26 -0600)]
glx: remove #include "glheader.h" lines
Was only used to get the PUBLIC/USED macros.
Also, replace "GL_FALSE" with "False" in a couple places.
Brian Paul [Thu, 18 Sep 2008 19:23:06 +0000 (13:23 -0600)]
glx: remove depency on glheader.h and GLboolean type in XF86DRI code
Return Bool instead of GLboolean to match other functions.
Define PUBLIC/USED macros locally.
Brian Paul [Thu, 18 Sep 2008 18:26:54 +0000 (12:26 -0600)]
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...
Brian Paul [Wed, 17 Sep 2008 15:05:04 +0000 (09:05 -0600)]
mesa: fix bug in previous changes to _slang_resolve_attributes()
Eric Anholt [Wed, 17 Sep 2008 00:01:06 +0000 (17:01 -0700)]
intel: Destroy bufmgr in screen destroy, not context.
Caused server crashes on second context creation since
7e0bbdcf033981282978554c2e68ce48b55aa291.
Bug #17600.
Brian Paul [Tue, 16 Sep 2008 22:28:36 +0000 (16:28 -0600)]
mesa: rework GLSL vertex attribute binding
Calls to glBindAttribLocation() should not take effect until the next time
that glLinkProgram() is called.
gl_shader_program::Attributes now just contains user-defined bindings.
gl_shader_program::VertexProgram->Attributes contains the actual/final bindings.
Brian Paul [Tue, 16 Sep 2008 19:23:01 +0000 (13:23 -0600)]
mesa: fix display list regression (check if save->prim_count > 0 in vbo_save_EndList())
Brian Paul [Mon, 15 Sep 2008 23:10:04 +0000 (17:10 -0600)]
mesa: fix MSAA enable state in update_multisample()
Brian Paul [Mon, 15 Sep 2008 15:07:32 +0000 (09:07 -0600)]
mesa: remove some assertions that are invalid during context tear-down
Keith Whitwell [Mon, 15 Sep 2008 12:47:25 +0000 (13:47 +0100)]
mesa: get another class of degenerate dlists working
Primitive begin in one dlist, end in another.
Keith Whitwell [Mon, 15 Sep 2008 12:47:12 +0000 (13:47 +0100)]
add dlist-degenerate test case
Shane Blackett [Sun, 14 Sep 2008 23:51:01 +0000 (17:51 -0600)]
glut: s/glut_fbc.c/glut_fcb.c/
Jakub Bogusz [Sat, 13 Sep 2008 20:35:02 +0000 (14:35 -0600)]
tdfx: fix crash and lack of visuals bug
Guillaume Melquiond [Sat, 13 Sep 2008 20:25:02 +0000 (14:25 -0600)]
i915: fix himask constant init for 64-bit build
Guillaume Melquiond [Sat, 13 Sep 2008 20:24:31 +0000 (14:24 -0600)]
glx: fix 64-bit datatype issue
Guillaume Melquiond [Sat, 13 Sep 2008 20:23:39 +0000 (14:23 -0600)]
mesa: return after _mesa_problem() calls
Guillaume Melquiond [Sat, 13 Sep 2008 20:23:14 +0000 (14:23 -0600)]
mesa: #include <stdio.h>
Guillaume Melquiond [Sat, 13 Sep 2008 20:22:15 +0000 (14:22 -0600)]
remove invalid XDestroyWindow() call
Guillaume Melquiond [Sat, 13 Sep 2008 20:21:50 +0000 (14:21 -0600)]
silence warning
Guillaume Melquiond [Sat, 13 Sep 2008 20:20:14 +0000 (14:20 -0600)]
GLU: fix asst warnings
Eric Anholt [Fri, 12 Sep 2008 22:48:13 +0000 (15:48 -0700)]
intel: Add a width field to regions, and use it for making miptrees in TFP.
Otherwise, we would use the pitch as width of the texture, and compiz would
render the pitch padding on the right hand side.
Eric Anholt [Fri, 12 Sep 2008 21:18:14 +0000 (14:18 -0700)]
Finish off the previous fix for TFP.
A couple of those lines of debug printfs I deleted weren't actually debug
printfs.
Eric Anholt [Fri, 12 Sep 2008 20:47:37 +0000 (13:47 -0700)]
intel: Don't segfault on TFP from a bad drawable.
Eric Anholt [Thu, 11 Sep 2008 16:50:47 +0000 (09:50 -0700)]
intel: Remove dead allow_batchbuffer param.
George Sapountzis [Fri, 12 Sep 2008 09:43:10 +0000 (12:43 +0300)]
dri/swrast: fix swapBuffers after dri2
Xiang, Haihao [Fri, 12 Sep 2008 01:25:34 +0000 (09:25 +0800)]
i965: Add support for G41 chipset which is another 4 series.
Shane Blackett [Thu, 11 Sep 2008 14:35:27 +0000 (08:35 -0600)]
added 24bpp support
Shane Blackett [Wed, 10 Sep 2008 14:22:45 +0000 (08:22 -0600)]
Fixes for Mingw