Christoph Bumiller [Tue, 24 Apr 2012 11:34:36 +0000 (13:34 +0200)]
nv50,nvc0: handle new vertex fetch caps
Christoph Bumiller [Tue, 24 Apr 2012 11:35:44 +0000 (13:35 +0200)]
nv50,nvc0: don't initialize the draw module, we don't use it
But some day we might (e.g. for blending 16 bpp formats on nv50).
Christoph Bumiller [Mon, 23 Apr 2012 18:08:54 +0000 (20:08 +0200)]
nv50: enable shader watchdog timer
Jeremy Huddleston [Mon, 23 Apr 2012 23:43:22 +0000 (16:43 -0700)]
darwin: Eliminate a pthread mutex leak
Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
Tested-by: Charles Davis <cdavis@mines.edu>
Marek Olšák [Mon, 23 Apr 2012 23:23:33 +0000 (01:23 +0200)]
radeonsi: stop using u_vbuf and adapt to gallium interface changes
Marek Olšák [Thu, 19 Apr 2012 17:54:23 +0000 (19:54 +0200)]
u_vbuf: don't call u_vbuf_upload_buffers if there's nothing to upload
Marek Olšák [Thu, 19 Apr 2012 03:28:27 +0000 (05:28 +0200)]
u_vbuf: don't upload user buffers if the driver supports them
Marek Olšák [Thu, 19 Apr 2012 01:47:03 +0000 (03:47 +0200)]
u_vbuf: optimize u_vbuf_translate_find_free_vb_slots
Marek Olšák [Wed, 18 Apr 2012 22:56:44 +0000 (00:56 +0200)]
u_vbuf: turn bool arrays into bitmasks and loops into bitwise operations
Optimized functions:
- u_vbuf_need_minmax_index
- u_vbuf_mapping_vertex_buffer_blocks
Marek Olšák [Wed, 18 Apr 2012 23:41:46 +0000 (01:41 +0200)]
u_vbuf: take advantage of all new vertex fetch caps
Marek Olšák [Wed, 18 Apr 2012 23:24:32 +0000 (01:24 +0200)]
u_vbuf: simplify u_vbuf_set_vertex_buffers
Marek Olšák [Wed, 18 Apr 2012 23:12:55 +0000 (01:12 +0200)]
u_vbuf: rename native_attribs -> driver_attribs
Marek Olšák [Sun, 1 Apr 2012 21:54:44 +0000 (23:54 +0200)]
r600g: move updating vertex buffer state into set_vertex_buffers
Marek Olšák [Wed, 11 Apr 2012 10:55:23 +0000 (12:55 +0200)]
st/mesa: always expose ARB_ES2_compatibility
u_vbuf translates GL_FIXED too if needed.
Marek Olšák [Wed, 11 Apr 2012 10:54:10 +0000 (12:54 +0200)]
st/mesa: always expose ARB_half_float_vertex
u_vbuf kicks in and translates it to float if it's unsupported.
Marek Olšák [Tue, 10 Apr 2012 04:00:17 +0000 (06:00 +0200)]
gallium: make user vertex buffers optional
This couldn't be split because it would break bisecting.
Summary:
* r300g,r600g: stop using u_vbuf
* r300g,r600g: also report that the FIXED vertex type is unsupported
* u_vbuf: refactor for use in the state tracker
* cso: wire up u_vbuf with cso_context
* st/mesa: conditionally install u_vbuf
Marek Olšák [Wed, 11 Apr 2012 13:16:09 +0000 (15:16 +0200)]
i915g: report that all vertex formats are supported
So that u_vbuf isn't enabled.
Marek Olšák [Wed, 11 Apr 2012 14:00:09 +0000 (16:00 +0200)]
r600g: don't share u_upload_mgr with u_vbuf, create its own
Marek Olšák [Wed, 11 Apr 2012 14:00:09 +0000 (16:00 +0200)]
r300g: don't share u_upload_mgr with u_vbuf, create its own
Marek Olšák [Wed, 11 Apr 2012 13:56:59 +0000 (15:56 +0200)]
u_vbuf: pull u_vbuf_draw_max_vertex_count into r300g
Marek Olšák [Tue, 10 Apr 2012 03:14:26 +0000 (05:14 +0200)]
u_vbuf: make use of the new CAPs to determine what to do
This adds the ability to initialize u_vbuf_caps before creating u_vbuf itself.
It will be useful for determining if u_vbuf should be used or not.
Also adapt r300g and r600g.
Marek Olšák [Wed, 11 Apr 2012 13:40:00 +0000 (15:40 +0200)]
gallium drivers: report that user vertex buffers are supported
Marek Olšák [Tue, 10 Apr 2012 03:12:22 +0000 (05:12 +0200)]
gallium: add CAPs for vertex fetcher
Supported vertex formats will be queried using
is_format_supported(.., PIPE_BIND_VERTEX_BUFFER, ..).
Marek Olšák [Tue, 10 Apr 2012 19:29:06 +0000 (21:29 +0200)]
u_vbuf: remove u_vbuf_resource
Marek Olšák [Tue, 10 Apr 2012 02:37:52 +0000 (04:37 +0200)]
u_vbuf: use user_ptr from pipe_resource
Marek Olšák [Tue, 10 Apr 2012 02:33:23 +0000 (04:33 +0200)]
gallium: add user_ptr in pipe_resource
I need to access the pointer in st/mesa when I only have pipe_resource.
Marek Olšák [Sat, 31 Mar 2012 12:52:35 +0000 (14:52 +0200)]
u_vbuf: override draw_vbo
Marek Olšák [Sat, 31 Mar 2012 04:01:39 +0000 (06:01 +0200)]
u_vbuf: override create/bind/destroy_vertex_elements_state
Marek Olšák [Sat, 31 Mar 2012 03:32:25 +0000 (05:32 +0200)]
u_vbuf: override set_vertex_buffers
Marek Olšák [Sat, 31 Mar 2012 02:56:48 +0000 (04:56 +0200)]
u_vbuf: override set_index_buffer
This makes u_vbuf_mgr call the driver instead of the other way around.
Marek Olšák [Wed, 11 Apr 2012 14:08:22 +0000 (16:08 +0200)]
st/mesa: use cso_set_index_buffer and cso_draw_vbo
Reviewed-by: Brian Paul <brianp@vmware.com>
Marek Olšák [Wed, 11 Apr 2012 13:51:52 +0000 (15:51 +0200)]
gallium/util: use cso_draw_arrays in util_draw_vertex_buffer
Reviewed-by: Brian Paul <brianp@vmware.com>
Marek Olšák [Wed, 11 Apr 2012 13:51:13 +0000 (15:51 +0200)]
cso: add set_index_buffer and draw_vbo passthrough functions
v2: use util_draw_init_info
Reviewed-by: Brian Paul <brianp@vmware.com>
Jeremy Huddleston [Mon, 23 Apr 2012 23:13:51 +0000 (16:13 -0700)]
darwin: Don't build gallium
fe3f98ed70be01a49dd2e93870907d092fe4a283 intentionally broke it, so
don't build it.
Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
Jonas Maebe [Mon, 23 Apr 2012 23:02:16 +0000 (16:02 -0700)]
apple: Fix a use after free
Reviewed-by: Jeremy Huddleston <jeremyhu@apple.com>
Marek Olšák [Sun, 22 Apr 2012 17:21:45 +0000 (19:21 +0200)]
vbo: call UpdateState directly when notifying a driver about _NEW_ARRAY
Core Mesa doesn't need to know about this.
This also removes the hack in recalculate_input_bindings.
Reviewed-by: Brian Paul <brianp@vmware.com>
Marek Olšák [Sun, 22 Apr 2012 14:36:38 +0000 (16:36 +0200)]
vbo: do FLUSH_CURRENT before validating and updating state
This fixes an assertion failure since:
commit
81afdd20f3f574ce29559d8ad77df5c77652009e
vbo: don't check twice whether it's valid to render
FLUSH_CURRENT may set _NEW_CURRENT_ATTRIB.
Reviewed-by: Brian Paul <brianp@vmware.com>
Marek Olšák [Thu, 19 Apr 2012 02:33:43 +0000 (04:33 +0200)]
r300g/automake: add $ARCH_FLAGS and $OPT_FLAGS
Reviewed-by: Tom Stellard <thomas.stellard@amd.com>
Marek Olšák [Thu, 19 Apr 2012 02:33:43 +0000 (04:33 +0200)]
r600g/automake: add $ARCH_FLAGS and $OPT_FLAGS
Reviewed-by: Tom Stellard <thomas.stellard@amd.com>
Brian Paul [Mon, 23 Apr 2012 19:29:06 +0000 (13:29 -0600)]
r600g: init vars to silence warnings
Han Shen(沈涵) [Mon, 23 Apr 2012 14:28:12 +0000 (08:28 -0600)]
bin/mklib: remove '-m32' for arm linux
-m32 is not a valid option for ARM.
NOTE: This is a candidate for the 8.0 branch.
Signed-off-by: Brian Paul <brianp@vmware.com>
Brian Paul [Fri, 20 Apr 2012 22:45:12 +0000 (16:45 -0600)]
st/mesa: no-op glCopyPixels if source region is out of bounds
If the source region for a glCopyPixels is completely outside the
source buffer bounds, no-op the copy. Fixes a failed assertion.
NOTE: This is a candidate for the 8.0 branch.
Reviewed-by: Jose Fonseca <jfonseca@vmware.com>
Tom Stellard [Fri, 20 Apr 2012 13:12:47 +0000 (09:12 -0400)]
radeon/llvm: Don't print an error message when there is no error
A blank line with an empty error message was being printed even when the
target lookup succeeded.
Tom Stellard [Thu, 19 Apr 2012 14:14:41 +0000 (10:14 -0400)]
radeon/llvm: Lower VCREATE_v4f32 for R600 and SI
Tom Stellard [Thu, 19 Apr 2012 14:09:52 +0000 (10:09 -0400)]
r600g/llvm: Let ISel handle lowering to {INSERT,EXTRACT}_SUBREG
Tom Stellard [Thu, 19 Apr 2012 15:47:08 +0000 (11:47 -0400)]
r600g/llvm: Only emit an instruction's explicit operands
Tom Stellard [Fri, 20 Apr 2012 13:07:37 +0000 (09:07 -0400)]
r600g/llvm: Handle copies between vector registers
Tom Stellard [Thu, 19 Apr 2012 19:19:21 +0000 (15:19 -0400)]
r600g/llvm: Remove debugging hack from R600InstrInfo::copyPhysReg()
Tom Stellard [Thu, 19 Apr 2012 14:12:05 +0000 (10:12 -0400)]
r600g/llvm: Tell the code emitter to ignore KILL and BUNDLE
Tom Stellard [Tue, 28 Feb 2012 22:32:28 +0000 (17:32 -0500)]
r600/llvm: Add LOAD_VTX instruction
Tom Stellard [Tue, 17 Apr 2012 13:26:28 +0000 (09:26 -0400)]
r600g: Add hooks for the LLVM shader compiler
The LLVM backend can now be enabled for r600g by using the
--enable-r600-llvm-compiler configure flag. If you configure with this
flag, you can still use the default compiler by setting the envrionment
variable R600_USE_LLVM=0
Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
Tom Stellard [Tue, 17 Apr 2012 12:37:38 +0000 (08:37 -0400)]
r600g: Add TGSI->LLVM implementation v2
v2: Add case for ARUBA in r600_llvm_gpu_string()
Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
Tom Stellard [Mon, 16 Apr 2012 21:48:44 +0000 (17:48 -0400)]
radeon: Move radeon_llvm_emit.cpp declarations into their own header
Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
Tom Stellard [Mon, 16 Apr 2012 21:47:04 +0000 (17:47 -0400)]
radeon: Remove HAVE_LLVM ifdefs
Only LLVM 3.1 is supported, so these are not necessary.
Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
Vadim Girlin [Fri, 16 Dec 2011 03:32:07 +0000 (07:32 +0400)]
r600g: fix gpr number calculation
Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
Signed-off-by: Tom Stellard <thomas.stellard@amd.com>
Tom Stellard [Tue, 17 Apr 2012 13:24:29 +0000 (09:24 -0400)]
configure.ac: Move HAVE_LLVM definition into configure.ac
Otherwise HAVE_LLVM won't be included in the $(DEFINES) variable for
Automake generated Makefiles.
Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
Dave Airlie [Mon, 23 Apr 2012 09:20:10 +0000 (10:20 +0100)]
r600g: split add_reg into add_reg and add_reg_bo variants
This shaves 2k off the final dri.so, and removes lots of pointless
NULL, 0 passing.
most like pointless - but it looked nicer to me.
Signed-off-by: Dave Airlie <airlied@redhat.com>
Jonas Maebe [Mon, 23 Apr 2012 03:39:32 +0000 (20:39 -0700)]
glapi: Correct size of allocated _glapi_table struct
The __glapi_gentable_set_remaining_noop() routine treats the _glapi_struct
as an array of _glapi_get_dispatch_table_size() pointers, so we have to
allocate _glapi_get_dispatch_table_size()*sizeof(void*) bytes rather
than sizeof(struct _glapi_struct) bytes.
Reviewed-by: Jeremy Huddleston <jeremyhu@apple.com>
Dave Airlie [Sun, 22 Apr 2012 07:09:05 +0000 (08:09 +0100)]
r600g: enable GLSL130 on all cards
Alexandre Demers sent me some cayman results with no major problems.
I'll rip out the env var in a week or so.
Signed-off-by: Dave Airlie <airlied@redhat.com>
Dave Airlie [Sat, 21 Apr 2012 16:46:35 +0000 (17:46 +0100)]
r600g: enable dual src blending on r600 cards
tested on my rv610 and it passes the tests with no hangs.
Signed-off-by: Dave Airlie <airlied@redhat.com>
Dave Airlie [Sat, 21 Apr 2012 16:40:32 +0000 (17:40 +0100)]
r600g: enable GLSL 1.30 for r600 class
Full piglit run on my rv610 with no regressions.
This only leaves cayman, however my cayman is resisting my attempt
to get through a full piglit run.
Signed-off-by: Dave Airlie <airlied@redhat.com>
Dave Airlie [Sat, 21 Apr 2012 09:37:08 +0000 (10:37 +0100)]
r600: enable glsl 1.30 on r700
I've done a piglit run on rv740 and confirmed no regressions.
We don't get GL3 on r700 due to transform feedback being busted still.
Signed-off-by: Dave Airlie <airlied@redhat.com>
Dave Airlie [Fri, 20 Apr 2012 18:33:22 +0000 (19:33 +0100)]
r600g: report INTEGERS cap if glsl130 is on.
This cap is used by u_blitter to decide if it can use integers
in vertex data.
fixes some crashes with glsl130 in piglit
Signed-off-by: Dave Airlie <airlied@redhat.com>
Dave Airlie [Fri, 20 Apr 2012 18:01:57 +0000 (19:01 +0100)]
r600g: enable glsl 130 on evergreen.
I've done a piglit run on my SUMO machine and I see no regressions.
Lots of things to fix (skip->fail), but hey maybe we can fix them
if we can see them.
I'll try and work my way across r600,700,cayman sometime if nobody
else gets to them.
Signed-off-by: Dave Airlie <airlied@redhat.com>
Vadim Girlin [Mon, 9 Apr 2012 15:35:40 +0000 (19:35 +0400)]
r600g: disable I2F conversion for InstanceID if integers are supported
Signed-off-by: Vadim Girlin <vadimgirlin@gmail.com>
Reviewed-by: Michel Dänzer <michel@daenzer.net>
Signed-off-by: Dave Airlie <airlied@redhat.com>
Vadim Girlin [Mon, 9 Apr 2012 15:35:39 +0000 (19:35 +0400)]
r600g: store glsl_feature_level in the r600_screen
Signed-off-by: Vadim Girlin <vadimgirlin@gmail.com>
Reviewed-by: Michel Dänzer <michel@daenzer.net>
Signed-off-by: Dave Airlie <airlied@redhat.com>
Brian Paul [Wed, 18 Apr 2012 16:47:10 +0000 (10:47 -0600)]
mesa: move gl_array_attrib::NewState to gl_array_object::NewArrays
The field wasn't actually used before and it's not used now either.
But this is a more logical place for it and will hopefully allow
doing smarter draw/array validation (per array object) in the future.
Reviewed-by: Mathias Fröhlich <Mathias.Froehlich@web.de>
Brian Paul [Thu, 19 Apr 2012 20:38:45 +0000 (14:38 -0600)]
docs: recommend 2GB of RAM for Viewperf tests
Eric Anholt [Wed, 11 Apr 2012 20:24:22 +0000 (13:24 -0700)]
i965: Convert live interval computation to using live variable analysis.
Our previous live interval analysis just said that anything in a loop
was live for the whole loop. If you had to spill a reg in a loop,
then we would consider the unspilled value live across the loop too,
so you never made progress by spilling. Eventually it would consider
everything in the loop unspillable and fail out.
With the new analysis, things completely deffed and used inside the
loop won't be marked live across the loop, so even if you
spill/unspill something that used to be live across the loop, you
reduce register pressure. But you usually don't even have to spill
any more, since our intervals are smaller than before.
This fixes assertion failure trying to compile the shader for the
"glyphy" text rasterier and piglit glsl-fs-unroll-explosion.
Improves Unigine Tropics performance 1.3% +/- 0.2% (n=5), by allowing
more shaders to be compiled in 16-wide mode.
Eric Anholt [Wed, 11 Apr 2012 20:14:27 +0000 (13:14 -0700)]
i965: Move the old live interval analysis code next to the new live vars code.
I'm about to replace the insides of this using the new analysis.
Eric Anholt [Wed, 11 Apr 2012 20:12:33 +0000 (13:12 -0700)]
i965: Add support for live variable analysis using dataflow analysis.
Eric Anholt [Tue, 10 Apr 2012 19:01:50 +0000 (12:01 -0700)]
i965: Add basic block generator.
This takes the fs_inst list generated by the visitor, and generates a
list of basic blocks with edges between them. This is a building
block for data-flow analysis.
Eric Anholt [Wed, 11 Apr 2012 20:45:55 +0000 (13:45 -0700)]
i965/fs: Suppress printing the whole loop in BRW_OPCODE_DO annotation.
Eric Anholt [Fri, 30 Mar 2012 00:29:20 +0000 (17:29 -0700)]
glsl: Properly throw compile-time errors for conflicting FS output writes.
We were checking for these at link time previously, which is not as
early as mandated, and would actually fail to detect conflicting
writes if dead code removal removed some writes.
Fixes failures in piglit
glsl-*/compiler/fragment-outputs/write-gl_Frag*
Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
Eric Anholt [Fri, 30 Mar 2012 00:02:15 +0000 (17:02 -0700)]
glsl: Track in each ir_variable whether it was ever assigned.
This will be used for some compile-and-link-time error checking, where
currently we've been doing error checking only at link time.
Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
Eric Anholt [Mon, 16 Apr 2012 16:53:29 +0000 (09:53 -0700)]
glsl: Convert the tests directory to automake.
This runs optimization-test and produces the usual automake test
output, which may be interesting to automated build systems.
This doesn't convert the tests to be individually exposed to the
automake runner, because automake doesn't like wildcards (due to being
nonportable in make, not that we care).
Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
Eric Anholt [Mon, 16 Apr 2012 16:52:45 +0000 (09:52 -0700)]
glsl: Fix up some comments in structure splitting, based on array-split work.
Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
Eric Anholt [Mon, 16 Apr 2012 16:45:07 +0000 (09:45 -0700)]
glsl: Don't allow array splitting on function arguments.
This is the reason the declaration member existed in the reference
visitor, but I didn't copy the code from structure splitting that
avoided setting it.
This wasn't currently a problem, because we don't allow splitting of
in/out variables. But that would be nice to change some day.
Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
Eric Anholt [Mon, 16 Apr 2012 16:26:32 +0000 (09:26 -0700)]
glsl: Rename the "whole_array_access" member in array splitting.
This was carried over from structure splitting, without thinking about
whether the name still made sense in this context.
Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
Eric Anholt [Mon, 16 Apr 2012 16:17:46 +0000 (09:17 -0700)]
glsl: Fix up a comment explaining what a visitor class does.
Ken noted that some of the "actual work" was happening in the caller
of this class.
Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
Eric Anholt [Mon, 16 Apr 2012 16:15:36 +0000 (09:15 -0700)]
glsl: Use the column_types() helper method.
Ken noted this in a review of this patch that I pushed early.
Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
Eric Anholt [Mon, 16 Apr 2012 21:33:34 +0000 (14:33 -0700)]
glx: Use AM_CPPFLAGS to pass -I and -D to both C and C++ compiles.
Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
Reviewed-by: Adam Jackson <ajax@redhat.com>
Marek Olšák [Thu, 19 Apr 2012 18:47:22 +0000 (20:47 +0200)]
Revert "mesa: only update _MaxElement when we actually need it"
This reverts commit
0de5a21470b3bff9b7c8714e5d960d5ed9d01b9c.
I was wrong, we use it in the vbo module too.
This fixes a performance regression in Nexuiz.
Michel Dänzer [Thu, 19 Apr 2012 17:14:45 +0000 (19:14 +0200)]
radeonsi: Fix VGPR_BIT() definition.
Fixes encoding of VOP3 shader instructions.
The shift was wrong for source registers 2 and 3, and the resulting value was
only 32 bits, so the shift in SICodeEmitter::VOPPostEncode() didn't work as
intended.
Michel Dänzer [Thu, 19 Apr 2012 14:46:15 +0000 (16:46 +0200)]
radeonsi: Replace magic numbers for vertex buffer resource.
Michel Dänzer [Thu, 19 Apr 2012 09:41:48 +0000 (11:41 +0200)]
radeonsi: (User) SGPR related cleanups.
Use the same user SGPRs for the same purpose in vertex and pixel shaders.
Better calculation of the number of SGPRs to reserve.
Michel Dänzer [Thu, 19 Apr 2012 08:35:31 +0000 (10:35 +0200)]
radeonsi: Fix sampler offsets for shader intrinsic.
The sampler number is in TGSI source register 1, and the S_LOAD_DWORD*
instructions take offsets in DWORDs, not bytes.
Brian Paul [Thu, 19 Apr 2012 15:56:36 +0000 (09:56 -0600)]
docs: overhaul the Mesa build/install instructions
Rearrange thing in general. Mark the legacy Makefile system as deprecated.
Brian Paul [Thu, 19 Apr 2012 14:56:02 +0000 (08:56 -0600)]
docs: freshen up the download/unpack instructions
Brian Paul [Thu, 19 Apr 2012 13:56:05 +0000 (07:56 -0600)]
mesa: move unrefs of array objects earlier in _mesa_free_context_data()
If a non-default array object was bound at context destruction time
we'd try to unreference the array object after it was already deleted
in _mesa_free_varray_data(). Now do the unref first.
Fixes a regression from commit
86f53e6d6bd07e2bc3ffcadeb9a4418fbae06e0b.
Reviewed-by: José Fonseca <jfonseca@vmware.com>
Christoph Bumiller [Thu, 19 Apr 2012 12:44:56 +0000 (14:44 +0200)]
nv50,nvc0: prevent multiple flushes when user spins on get_query_result
Christoph Bumiller [Wed, 18 Apr 2012 15:00:52 +0000 (17:00 +0200)]
nv50/ir/opt: swap VP inputs to first source where possible
Marek Olšák [Mon, 16 Apr 2012 14:41:09 +0000 (16:41 +0200)]
vbo: remove vbo_context::mat_currval
Reviewed-by: Brian Paul <brianp@vmware.com>
Reviewed-by: Mathias Fröhlich <Mathias.Froehlich@web.de>
Marek Olšák [Mon, 16 Apr 2012 14:35:58 +0000 (16:35 +0200)]
vbo: remove vbo_context::generic_currval
Reviewed-by: Brian Paul <brianp@vmware.com>
Reviewed-by: Mathias Fröhlich <Mathias.Froehlich@web.de>
Marek Olšák [Mon, 16 Apr 2012 14:24:39 +0000 (16:24 +0200)]
vbo: remove vbo_context::legacy_currval
It's not nice when you have several variables pointing to the same array
and you wanna ask your editor "where is this used" and you only get an answer
for one of the four currval, legacy_currval, generic_currval, mat_currval,
which is quite useless, because you never see the whole picture.
Let's get rid of the additional pointers.
Reviewed-by: Brian Paul <brianp@vmware.com>
Reviewed-by: Mathias Fröhlich <Mathias.Froehlich@web.de>
Marek Olšák [Mon, 16 Apr 2012 12:37:29 +0000 (14:37 +0200)]
vbo: remove unused variables in vbo_context
Reviewed-by: Brian Paul <brianp@vmware.com>
Reviewed-by: Mathias Fröhlich <Mathias.Froehlich@web.de>
Marek Olšák [Mon, 16 Apr 2012 03:55:08 +0000 (05:55 +0200)]
vbo: don't check twice whether it's valid to render
It's already done in _mesa_validate_Draw* and it's not needed to do it again
unless I am missing something.
Reviewed-by: Brian Paul <brianp@vmware.com>
Reviewed-by: Mathias Fröhlich <Mathias.Froehlich@web.de>
Marek Olšák [Mon, 16 Apr 2012 14:04:52 +0000 (16:04 +0200)]
mesa: set _NEW_VARYING_VP_INPUTS flag only if fixed-func VP is enabled & valid
Reviewed-by: Brian Paul <brianp@vmware.com>
Reviewed-by: Mathias Fröhlich <Mathias.Froehlich@web.de>
Marek Olšák [Mon, 16 Apr 2012 02:21:03 +0000 (04:21 +0200)]
mesa: add _NEW_VARYING_VP_INPUTS for gl_context::varying_vp_inputs
This is a frequently-updated state and _NEW_ARRAY already causes revalidation
of the vbo module. It's kinda counter-productive to recompute arrays
in the vbo module if _NEW_ARRAY is set and then set _NEW_ARRAY again.
Reviewed-by: Brian Paul <brianp@vmware.com>
Reviewed-by: Mathias Fröhlich <Mathias.Froehlich@web.de>
Marek Olšák [Mon, 16 Apr 2012 01:34:22 +0000 (03:34 +0200)]
mesa,vbo: properly detect when vertex arrays need to be recalculated
This moves the RebindArrays flag into the vbo module, consolidates the code,
and adds missing vbo_draw_method calls.
Also with this change, the vertex arrays are not needlessly recalculated twice.
The issue with the old code was:
- If recalculate_input_bindings updates vp_varying_inputs, _NEW_ARRAY is set.
- _mesa_update_state is called and the vp_varying_inputs change causes
regeneration of the fixed-function shaders, which also sets _NEW_PROGRAM.
- The occurence of either _NEW_ARRAY or _NEW_PROGRAM sets
the recalculate_inputs flag to TRUE again.
- The new code sets the flag to FALSE after the second _mesa_update_state,
because there can't possibly be any change which would require recalculating
the arrays.
Reviewed-by: Brian Paul <brianp@vmware.com>
Reviewed-by: Mathias Fröhlich <Mathias.Froehlich@web.de>