OSDN Git Service
Brian Paul [Thu, 25 Sep 2008 17:03:46 +0000 (11:03 -0600)]
mesa: fix some VBO buffer object issues
The VBO module may use a real VBO or a malloc'd buffer for vertex storage.
Be careful not to accidentally replace the later with the former when drawing.
Check if using a real VBO at destroy time to prevent a double-free.
Sam Hocevar [Thu, 25 Sep 2008 15:58:27 +0000 (09:58 -0600)]
mesa: fix function params to match prototypes
Sam Hocevar [Thu, 25 Sep 2008 12:56:41 +0000 (14:56 +0200)]
mesa: prevent the slang code generator from aborting when faced with a sampler variable redeclaration.
Sam Hocevar [Thu, 25 Sep 2008 08:49:05 +0000 (10:49 +0200)]
i965: support for sin() and cos() in vertex shaders.
Sam Hocevar [Tue, 23 Sep 2008 15:56:19 +0000 (17:56 +0200)]
i965: more meaningful message for unsupported opcodes.
Eric Anholt [Wed, 24 Sep 2008 22:10:45 +0000 (15:10 -0700)]
intel: Fix clears to depth_stencil texture attachments.
Broken by
0adfd1021035e90995a25ec5f20b736e55075d92, showed up as an assertion
failure in a software fallback in the shadowtex demo when we failed to
recognize the texture format.
Brian [Fri, 14 Dec 2007 18:42:28 +0000 (11:42 -0700)]
set SamplerUnit[] entry in load_texture() just to be safe
(cherry picked from commit
fce4612f8a29ee1798c9326a431a139d856c7a04)
Brian [Fri, 18 Jan 2008 19:45:27 +0000 (12:45 -0700)]
use PROGRAM_CONSTANT instead of PROGRAM_STATE_VAR when generating immediates/literals
(cherry picked from commit
fdc8636bdc65deb0d95a62a51c8d9bca05bc6bb8)
Brian [Fri, 14 Dec 2007 18:16:49 +0000 (11:16 -0700)]
set program->SamplersUsed bit when using a texture instruction
Brian [Mon, 29 Oct 2007 18:25:46 +0000 (12:25 -0600)]
Remove ctx field from texenvprog_cache
Brian [Tue, 25 Sep 2007 21:20:04 +0000 (15:20 -0600)]
include programopt.h
(cherry picked from commit
83fad68ec1989c719646a76f4cc5e0b3d23537ed)
Brian [Tue, 25 Sep 2007 21:18:51 +0000 (15:18 -0600)]
Disable vertex shader fog, compute fog in fragment shader.
Brian [Wed, 19 Sep 2007 01:29:26 +0000 (19:29 -0600)]
temporarily set the FRAG_BIT_FOGC bit in InputsRead when fog is enabled
(cherry picked from commit
63be96bdc7e9f388a5c49295bd7e150462fd003a)
Keith Whitwell [Wed, 24 Sep 2008 04:08:50 +0000 (21:08 -0700)]
mesa: fix main/ prefix in include
Keith Whitwell [Tue, 18 Dec 2007 16:56:22 +0000 (16:56 +0000)]
vbo: unmap and remap immediate vbo before/after each draw.
Also use BufferData(NULL) to get fresh storage and avoid synchronous
operation where we would have to flush and wait for the fence after each
draw because of the map.
This will chew through a whole load of buffer space on small draws, so
it isn't a proper solution. Need to support a no-fence or append mapping
mode to do this right, or use user buffers.
Brian [Fri, 17 Aug 2007 14:26:33 +0000 (15:26 +0100)]
added vbo_use_buffer_objects() to specify that immediate mode data should be put into bufferobjects
Keith Whitwell [Mon, 25 Aug 2008 09:59:45 +0000 (10:59 +0100)]
vbo: seed initial max_element value with a more likely candidate
(cherry picked from commit
026e7731e549e0777c010348460fd48b3d75a843)
Brian Paul [Tue, 17 Jun 2008 17:31:45 +0000 (11:31 -0600)]
mesa: s/GL_POLYGON+1/PRIM_OUTSIDE_BEGIN_END/
(cherry picked from commit
8a369b909a6648ae7a5a0c2dcb972a2f96f99a80)
Brian Paul [Wed, 6 Aug 2008 19:07:09 +0000 (13:07 -0600)]
mesa: glsl: fix glGetUniform for matrix queries
(cherry picked from commit
7a6eba54d064cadf15f93df2c1748cf5e474ef03)
Brian Paul [Wed, 6 Aug 2008 22:26:47 +0000 (16:26 -0600)]
mesa: glsl: fix a number of glUniform issues
Additional error checking.
Allow setting elements of uniform arrays. This involves encoding both
a uniform location and a parameter offset in the value returned by
glGetUniformLocation().
Limit glUniform[if]v()'s count to the size of the uniform array.
When setting bool-valued uniforms, convert all float/int values to 0 or 1.
Brian Paul [Wed, 6 Aug 2008 18:45:14 +0000 (12:45 -0600)]
mesa: glsl: fix error check in get_uniformfv()
(cherry picked from commit
18cd9c229a1fc8da8b7669b8d1d100f6bbeca183)
José Fonseca [Sat, 31 May 2008 09:14:09 +0000 (18:14 +0900)]
mesa: Apply MSVC portability fixes from Alan Hourihane.
Brian Paul [Wed, 17 Sep 2008 19:13:02 +0000 (13:13 -0600)]
mesa: update program->NumAddressRegs field in _slang_update_inputs_outputs()
Brian Paul [Wed, 18 Jun 2008 17:00:43 +0000 (11:00 -0600)]
mesa: add fwd decl of fill_in_entrypoint_offset()
(cherry picked from commit
b1eff0228b7199920c02e62446ebf5496c298814)
Brian Paul [Wed, 17 Sep 2008 22:48:13 +0000 (16:48 -0600)]
mesa: new gl_fragment_program fields indicating use of fog, front-facing, point coord
(cherry picked from commit
d7a7b0a10dd355fbeb7a404091a42d4ab558c820)
Brian [Wed, 26 Sep 2007 23:03:11 +0000 (17:03 -0600)]
Added new _mesa_clip_copytexsubimage() function to do avoid clipping down in the drivers.
This should probably be pulled into main-line Mesa...
(cherry picked from commit
324ecadbfdf9b944e059832f146451e4151dcb21)
Brian Paul [Tue, 17 Jun 2008 19:23:32 +0000 (13:23 -0600)]
mesa: refactor: move GetProcAddress code from glapi.c into new glapi_getproc.c file
Eric Anholt [Tue, 23 Sep 2008 22:53:29 +0000 (15:53 -0700)]
i965: Cope with batch getting flushed in the middle of batchbuffer emits.
This isn't required for GEM (at least, yet), but the check_aperture code
for non-GEM results in batch getting flushed during emit. brw_state_upload
restarts state emits, but a bunch of the state emit functions were assuming
that they would be called exactly once, after prepare and before new_batch.
Bug #17179.
Eric Anholt [Tue, 23 Sep 2008 22:32:41 +0000 (15:32 -0700)]
intel: Add missing include files for meta drawpixels since mesa shuffling.
Eric Anholt [Sat, 20 Sep 2008 23:13:38 +0000 (16:13 -0700)]
intel: Replace pbo-only drawpixels function with a generic Mesa metaops.
Improves performance of some oglconform regression tests 9x.
Eric Anholt [Mon, 22 Sep 2008 01:26:45 +0000 (18:26 -0700)]
i915: Fix overlapping CopyPixels with negative pixel zoom.
Fixes a failure in pixel-pos.c oglconform test.
Eric Anholt [Sun, 21 Sep 2008 01:07:17 +0000 (18:07 -0700)]
i915: fix crash in flush_prim -> wait_flips -> flush_batch -> flush_prim.
Ian Romanick [Tue, 23 Sep 2008 00:23:40 +0000 (17:23 -0700)]
i965: Adapt to new TNL program tracking semantics
This fixes bugzilla #17718.
Michel Dänzer [Mon, 22 Sep 2008 09:49:34 +0000 (11:49 +0200)]
r300: Adapt to the removal of _tnl_ProgramCacheInit() and friends.
Michel Dänzer [Mon, 22 Sep 2008 09:48:26 +0000 (11:48 +0200)]
Remove incorrect test from mmAllocMem.
0 is a perfectly valid alignment shift, see e.g. driTexturesGone() which was
broken by this.
Brian Paul [Wed, 20 Aug 2008 00:14:15 +0000 (18:14 -0600)]
mesa: allow for extra per-context init
(cherry picked from commit
815cdcfbc0740c66b901361620c88d99541bdad2)
Brian Paul [Tue, 12 Aug 2008 23:41:57 +0000 (17:41 -0600)]
mesa: texture crop rect state
(cherry picked from commit
c01fbc7866d7cd5cf4263dffec6d9591470b4c23)
Brian Paul [Tue, 12 Aug 2008 16:00:36 +0000 (10:00 -0600)]
mesa: set point state
(cherry picked from commit
af3d9dba562813ffed71691bffd7faf6665c4487)
Brian Paul [Fri, 8 Aug 2008 19:06:54 +0000 (13:06 -0600)]
mesa: fix some feature tests
(cherry picked from commit
74b14fe6ddbece8bc662aac4d3b2b18d8d853486)
Brian Paul [Fri, 8 Aug 2008 18:29:48 +0000 (12:29 -0600)]
mesa: fix some pixel transfer state tests for depth formats
(cherry picked from commit
966e199e409a1b52eef88e48997442250997f45e)
Brian Paul [Fri, 25 Jul 2008 14:34:54 +0000 (08:34 -0600)]
mesa: fix issues causing warnings on Windows
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)