OSDN Git Service
Eric Anholt [Thu, 9 Oct 2008 06:34:38 +0000 (23:34 -0700)]
i915: Accelerate depth textures with border color.
The fallback was introduced to fix bug #16697, but made the test it was
fixing run excessively long.
Brian Paul [Wed, 8 Oct 2008 15:33:27 +0000 (09:33 -0600)]
mesa: vertex emit debug code (disabled)
Brian Paul [Wed, 8 Oct 2008 15:28:10 +0000 (09:28 -0600)]
mesa: fix vertex format/attribute bug
If the tnl output attributes matches the swsetup input attributes we still
need to check if the desired vertex color type (float vs. chan) has changed
so that we use the right emit functions.
Fixes a conformance failure found with logicop test at pathlevel 3.
Eric Anholt [Wed, 8 Oct 2008 01:47:31 +0000 (18:47 -0700)]
mesa: Pass the context to query object delete cb to avoid null dereference.
Eric Anholt [Tue, 7 Oct 2008 00:34:51 +0000 (17:34 -0700)]
i965: Add ARB_occlusion_query support.
Eric Anholt [Fri, 3 Oct 2008 23:20:00 +0000 (16:20 -0700)]
intel: Push flushing for cliprects changes down into the cliprects changes.
This lets us short-circuit when we're leaving the same cliprects in place,
which becomes quite common with metaops clears, and may be useful for some of
our FBO paths.
Xiang, Haihao [Wed, 8 Oct 2008 01:30:12 +0000 (09:30 +0800)]
i965: Fix a potential assertion failure.
Brian Paul [Tue, 7 Oct 2008 22:52:47 +0000 (16:52 -0600)]
mesa: pass 'mask', not NULL to renderbuffer->Put functions
Fixes bug 17800.
Brian [Mon, 6 Oct 2008 23:10:22 +0000 (17:10 -0600)]
mesa: fix convolve/convolution mix-ups
Brian Paul [Mon, 6 Oct 2008 18:29:29 +0000 (12:29 -0600)]
mesa: set FRAG_BIT_FOGC bit in InputsUsed if FogOption!=GL_NONE
Brian Paul [Mon, 6 Oct 2008 17:34:01 +0000 (11:34 -0600)]
mesa: adjust texcoords for swrast sprite points.
Fixes glean pointSprite test w/ software rendering
Brian Paul [Mon, 6 Oct 2008 16:58:16 +0000 (10:58 -0600)]
mesa: fix static library construction
If the .a is made of other .a files, extract the objects from the later.
Brian Paul [Mon, 6 Oct 2008 15:32:33 +0000 (09:32 -0600)]
mesa: updated _mesa_delete_query() comments
Brian Paul [Mon, 6 Oct 2008 15:26:45 +0000 (09:26 -0600)]
mesa: add missing GLcontext param to _mesa_delete_query().
Fixes vtk crash and others.
Eric Anholt [Sun, 5 Oct 2008 01:20:35 +0000 (18:20 -0700)]
i915: Refine the texture indirect lookup accounting.
Without this, we would reject programs which sampled multiple times from
registers defined in the same phase (block of instructions with the same
texture indirection count), as each sample would count as a new phase
beginning. Instead, keep track of which phases registers were written in,
and only bump phase when we're reading from one generated in this phase.
On the other hand, we failed to count oC or oD texture samples as being new
phases.
Bug #17865.
Ian Romanick [Fri, 3 Oct 2008 19:16:04 +0000 (12:16 -0700)]
intel: Don't advertise unsupported extensions on pre-965 hardware
Move GL_ARB_texture_non_power_of_two and GL_ATI_separate_stencil
from the generic extension list to the 965-specific list. Neither
extension is supported on i830-class hardware, and
GL_ATI_separate_stencil is not supported on i915-class hardare.
GL_ARB_texture_non_power_of_two is supported on i915-class hardare and
is already in the i915-specific list.
Ian Romanick [Wed, 1 Oct 2008 22:51:56 +0000 (15:51 -0700)]
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.
Eric Anholt [Wed, 1 Oct 2008 23:58:38 +0000 (16:58 -0700)]
i965: sampler default color ends up in texture cache, not instructions.
See volume 4, SAMPLER_BORDER_COLOR_STATE programming notes.
Eric Anholt [Wed, 1 Oct 2008 21:14:06 +0000 (14:14 -0700)]
i965: Fix overwriting of depth override for SetTexOffset.
Fixes black borders around windows in compiz. Bug #17233.
Ian Romanick [Tue, 30 Sep 2008 01:50:05 +0000 (18:50 -0700)]
intel: Clean-up the extension string madness!
- Sort extensions by ARB, then EXT, then vendor by name
- Remove redundant (only one of GL_{ARB,EXT,NV}_texture_rectangle) or
duplicate extension strings
Ian Romanick [Mon, 29 Sep 2008 19:30:05 +0000 (12:30 -0700)]
GLSL: Implement GL_OBJECT_TYPE_ARB query
The GL_OBJECT_TYPE_ARB query is handled directly in
_mesa_GetObjectParamterivARB because it is only supported in the
extension version of the shanding language API. glGetProgramiv and
glGetShaderiv should not accept this enum.
Ian Romanick [Mon, 29 Sep 2008 19:27:00 +0000 (12:27 -0700)]
GLSL: Implement _mesa_get_handle
Implementing _mesa_get_handle in using
glGetIntegerv(GL_CURRENT_PROGRAM, ...) allows glGetHandleARB to work.
Ian Romanick [Mon, 29 Sep 2008 19:18:06 +0000 (12:18 -0700)]
GLSL: AttachShader returns INVALID_OPERATION for repeated attach
The GL_ARB_shader_objects spec says that glAttachShaderARB is supposed
to return GL_INVALID_OPERATION if a shader is attached to a program
where it is already attached. _mesa_attach_shader perviously returned
without error in this case.
Jouk Jansen [Mon, 29 Sep 2008 14:35:05 +0000 (08:35 -0600)]
mesa: asst updates for VMS
Shunichi Fuji [Fri, 26 Sep 2008 09:55:13 +0000 (18:55 +0900)]
mesa: drop calloc from _mesa_get_fixed_func_vertex_program
Signed-off-by: Shunichi Fuji <palglowr@gmail.com>
Ian Romanick [Mon, 29 Sep 2008 03:31:46 +0000 (20:31 -0700)]
Use 3Dnow! x86-64 routines only on processors that support 3Dnow!
Added an x86-64 CPUID function and use it to detect 3Dnow! If 3Dnow!
is available, use _mesa_3dnow_transform_points4_3d_no_rot,
_mesa_3dnow_transform_points4_perspective,
_mesa_3dnow_transform_points4_2d_no_rot, and _mesa_3dnow_transform_points4_2d.
This fixes long standing bug #8724.
Ian Romanick [Fri, 26 Sep 2008 00:19:47 +0000 (17:19 -0700)]
Remove TNL-to-VP tracking from i965
The i965 driver previously had it's own set of code to convert
fixed-function TNL state to a vertex program. Core Mesa has code to
do this, so there is no reason to duplicate that effort in the driver.
In fact, this duplication leads to bugs when other aspects of the Mesa
infrastructure change.
Tobias Jakobi [Sat, 27 Sep 2008 07:51:45 +0000 (08:51 +0100)]
glapi: add DISPATCH_FUNCTION_SIZE
Tobias Jakobi [Wed, 24 Sep 2008 02:38:19 +0000 (21:38 -0500)]
glapi: add gl_dispatch_functions_start and end
Eric Anholt [Fri, 26 Sep 2008 19:48:23 +0000 (12:48 -0700)]
intel: Fix a number of memory leaks on context destroy.
Jeremy Huddleston [Fri, 26 Sep 2008 19:36:42 +0000 (12:36 -0700)]
configs: darwin: Don't build GLw
(cherry picked from commit
ef688ba1ee366a8937a41075cbe8b76a9bf75013)
Brian Paul [Fri, 26 Sep 2008 13:45:06 +0000 (07:45 -0600)]
mesa: remove invalid assertions that programs have parameters
Fixes failure with demos/fplight.c
Brian Paul [Fri, 26 Sep 2008 13:40:45 +0000 (07:40 -0600)]
mesa: fix assertion in _mesa_reference_program()
Brad King [Fri, 26 Sep 2008 13:40:05 +0000 (07:40 -0600)]
mesa: fix param indexing
Brian [Fri, 26 Sep 2008 01:57:34 +0000 (19:57 -0600)]
mesa: fix cast/conversion for optional code
Brian Paul [Fri, 26 Sep 2008 00:55:52 +0000 (18:55 -0600)]
mesa: fix typo (s/feadback/feedback/). Fixes broken selection/feedback.
Brian Paul [Thu, 25 Sep 2008 17:54:00 +0000 (11:54 -0600)]
mesa: fix float->int mapping for glGetIntegerv(GL_DEPTH_CLEAR_VALUE)
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