OSDN Git Service
Dave Airlie [Sun, 19 Sep 2010 07:14:57 +0000 (17:14 +1000)]
r600g; add uses waterfall to asm cf for r6xx.
On r6xx if an MOVA instruction is emitted we should set this bit.
Tilman Sauerbeck [Sat, 18 Sep 2010 14:42:22 +0000 (16:42 +0200)]
r600g: Added support for TGSI_SEMANTIC_FACE.
This makes the 'glsl1-gl_FrontFacing var (1)' piglit test pass.
Signed-off-by: Tilman Sauerbeck <tilman@code-monkey.de>
Vinson Lee [Sun, 19 Sep 2010 06:07:41 +0000 (23:07 -0700)]
nv50: Remove dead initialization.
Vinson Lee [Sun, 19 Sep 2010 06:06:29 +0000 (23:06 -0700)]
nv50: Remove dead initialization.
Vinson Lee [Sat, 18 Sep 2010 22:59:00 +0000 (15:59 -0700)]
nv50: Silence missing initializer warning.
Fixes this GCC warning.
nv50_state_validate.c:336: warning: missing initializer
nv50_state_validate.c:336: error: (near initialization for 'validate_list[20].func')
Christoph Bumiller [Sat, 18 Sep 2010 18:52:44 +0000 (20:52 +0200)]
nv50: fix typo in fifo packet length limit
Kenneth Graunke [Sat, 18 Sep 2010 13:56:28 +0000 (15:56 +0200)]
glsl/builtins: Switch comparison functions to just return an expression.
Kenneth Graunke [Sat, 18 Sep 2010 12:44:18 +0000 (14:44 +0200)]
glsl/builtins: Fix equal and notEqual builtins.
Commit
309cd4115b7cba669a0bf858e7809cb6dae90ddf incorrectly converted
these to all_equal and any_nequal, which is the wrong operation.
Christoph Bumiller [Sat, 18 Sep 2010 13:19:34 +0000 (15:19 +0200)]
nv50: emit constbuf relocs before uploading constants
Christoph Bumiller [Sat, 18 Sep 2010 11:40:10 +0000 (13:40 +0200)]
nv50: add relocs for stack and local mem buffers
Kenneth Graunke [Sat, 18 Sep 2010 09:11:09 +0000 (11:11 +0200)]
glsl: Properly handle nested structure types.
Fixes piglit test CorrectFull.frag.
Vinson Lee [Sat, 18 Sep 2010 07:59:16 +0000 (00:59 -0700)]
r600g: Remove unused variable.
Vinson Lee [Sat, 18 Sep 2010 07:51:07 +0000 (00:51 -0700)]
nvfx: Silence uninitialized variable warnings.
Vinson Lee [Sat, 18 Sep 2010 07:47:36 +0000 (00:47 -0700)]
nvfx: Remove const qualifer from nvfx_vertprog_translate.
Silences this GCC warning.
nvfx_vertprog.c: In function 'nvfx_vertprog_translate':
nvfx_vertprog.c:998: warning: assignment discards qualifiers from pointer target type
Tilman Sauerbeck [Fri, 17 Sep 2010 23:56:34 +0000 (01:56 +0200)]
glsl2: Fixed cloning of ir_call error instructions.
Those have the callee field set to the null pointer, so
calling the public constructor will segfault.
Signed-off-by: Tilman Sauerbeck <tilman@code-monkey.de>
Vinson Lee [Sat, 18 Sep 2010 07:14:20 +0000 (00:14 -0700)]
glsl: Fix 'control reaches end of non-void function' warning.
Fixes this GCC warning.
lower_variable_index_to_cond_assign.cpp:
In member function
'bool variable_index_to_cond_assign_visitor::needs_lowering(ir_dereference_array*) const':
lower_variable_index_to_cond_assign.cpp:261:
warning: control reaches end of non-void function
Vinson Lee [Sat, 18 Sep 2010 06:59:23 +0000 (23:59 -0700)]
x86: Silence unused variable warning on Mac OS X.
Silences the following GCC warning on Mac OS X.
x86/common_x86.c:58: warning: 'detection_debug' defined but not used
Vinson Lee [Sat, 18 Sep 2010 06:43:38 +0000 (23:43 -0700)]
mesa: Silence "'valid_texture_object' defined but not used" warning.
Vinson Lee [Sat, 18 Sep 2010 06:35:09 +0000 (23:35 -0700)]
ir_to_mesa: Remove unused member array_indexed from struct statevar_element.
Fixes this GCC warning.
warning: missing initializer for member 'statevar_element::array_indexed'
Vinson Lee [Sat, 18 Sep 2010 00:52:13 +0000 (17:52 -0700)]
mesa: bump version to 7.10
Tilman Sauerbeck [Fri, 17 Sep 2010 16:50:07 +0000 (18:50 +0200)]
glsl2: Empty functions can be inlined.
Signed-off-by: Tilman Sauerbeck <tilman@code-monkey.de>
Signed-off-by: Kenneth Graunke <kenneth@whitecape.org>
Vinson Lee [Fri, 17 Sep 2010 21:27:39 +0000 (14:27 -0700)]
r600g: Silence unused variable warnings.
The variables are used in code that is currently ifdef'ed out.
Vinson Lee [Fri, 17 Sep 2010 21:21:32 +0000 (14:21 -0700)]
r600g: Silence uninitialized variable warning.
Vinson Lee [Fri, 17 Sep 2010 21:17:26 +0000 (14:17 -0700)]
r600g: Fix memory leak on error path.
Vinson Lee [Fri, 17 Sep 2010 21:06:23 +0000 (14:06 -0700)]
r600g: Fix implicit declaration warning.
Fixes this GCC warning.
r600_state2.c: In function 'r600_context_flush':
r600_state2.c:946: error: implicit declaration of function 'drmCommandWriteRead'
Vinson Lee [Fri, 17 Sep 2010 19:40:54 +0000 (12:40 -0700)]
r600g: Remove unnecessary headers.
Vinson Lee [Fri, 17 Sep 2010 19:38:29 +0000 (12:38 -0700)]
r600g: Remove unnecessary header.
José Fonseca [Thu, 16 Sep 2010 19:27:13 +0000 (20:27 +0100)]
llvmpipe: Default to no threading on single processor systems.
José Fonseca [Fri, 17 Sep 2010 10:13:37 +0000 (11:13 +0100)]
util: linearized sRGB values don't fit into 8bits
Fixes glean texture_srgb test.
Brian Paul [Fri, 17 Sep 2010 18:16:02 +0000 (12:16 -0600)]
gallivm: added missing case for PIPE_TEXTURE_RECT
Fixes fd.o bug 30245
Jerome Glisse [Fri, 17 Sep 2010 14:41:50 +0000 (10:41 -0400)]
r600g: alternative command stream building from context
Winsys context build a list of register block a register block is
a set of consecutive register that will be emited together in the
same pm4 packet (the various r600_block* are there to provide basic
grouping that try to take advantage of states that are linked together)
Some consecutive register are emited each in a different block,
for instance the various cb[0-7]_base. At winsys context creation,
the list of block is created & an index into the list of block. So
to find into which block a register is in you simply use the register
offset and lookup the block index. Block are grouped together into
group which are the various pkt3 group of config, context, resource,
Pipe state build a list of register each state want to modify,
beside register value it also give a register mask so only subpart
of a register can be updated by a given pipe state (the oring is
in the winsys) There is no prebuild register list or define for
each pipe state. Once pipe state are built they are bound to
the winsys context.
Each of this functions will go through the list of register and
will find into which block each reg falls and will update the
value of the block with proper masking (vs/ps resource/constant
are specialized variant with somewhat limited capabilities).
Each block modified by r600_context_pipe_state_set* is marked as
dirty and we update a count of dwords needed to emit all dirty
state so far.
r600_context_pipe_state_set* should be call only when pipe context
change some of the state (thus when pipe bind state or set state)
Then to draw primitive you make a call to r600_context_draw
void r600_context_draw(struct r600_context *ctx, struct r600_draw *draw)
It will check if there is enough dwords in current cs buffer and
if not will flush. Once there is enough room it will copy packet
from dirty block and then add the draw packet3 to initiate the draw.
The flush will send the current cs, reset the count of dwords to
0 and remark all states that are enabled as dirty and recompute
the number of dwords needed to send the current context.
Signed-off-by: Jerome Glisse <jglisse@redhat.com>
Tilman Sauerbeck [Fri, 17 Sep 2010 12:08:23 +0000 (14:08 +0200)]
r600g: Fixed the shift in S_02880C_KILL_ENABLE.
Signed-off-by: Tilman Sauerbeck <tilman@code-monkey.de>
Tilman Sauerbeck [Fri, 17 Sep 2010 10:49:51 +0000 (12:49 +0200)]
r600g: Enable PIPE_SHADER_CAP_TGSI_CONT_SUPPORTED.
Signed-off-by: Tilman Sauerbeck <tilman@code-monkey.de>
Tilman Sauerbeck [Fri, 17 Sep 2010 10:17:48 +0000 (12:17 +0200)]
r600g: Only set PA_SC_EDGERULE on rv770 and greater.
This is what xf86-video-ati and r600c do.
Signed-off-by: Tilman Sauerbeck <tilman@code-monkey.de>
Tilman Sauerbeck [Fri, 17 Sep 2010 10:05:26 +0000 (12:05 +0200)]
r600g: Added DB_SHADER_CONTROL defines.
Signed-off-by: Tilman Sauerbeck <tilman@code-monkey.de>
Tilman Sauerbeck [Thu, 16 Sep 2010 13:09:01 +0000 (15:09 +0200)]
r600g: Formatting fixes.
Signed-off-by: Tilman Sauerbeck <tilman@code-monkey.de>
Ian Romanick [Thu, 16 Sep 2010 12:40:26 +0000 (14:40 +0200)]
glsl2: Add flags to enable variable index lowering
Ian Romanick [Thu, 16 Sep 2010 10:12:22 +0000 (12:12 +0200)]
glsl2: Refactor testing for whether a deref is of a matrix or array
Luca Barbieri [Tue, 7 Sep 2010 23:35:44 +0000 (01:35 +0200)]
glsl: add pass to lower variable array indexing to conditional assignments
Currenly GLSL happily generates indirect addressing of any kind of
arrays.
Unfortunately DirectX 9 GPUs are not guaranteed to support any of them in
general.
This pass fixes that by lowering such constructs to a binary search on the
values, followed at the end by vectorized generation of equality masks, and
4 conditional assignments for each mask generation.
Note that this requires the ir_binop_equal change so that we can emit SEQ
to generate the boolean masks.
Unfortunately, ir_structure_splitting is too dumb to turn the resulting
constant array references to individual variables, so this will need to
be added too before this pass can actually be effective for temps.
Several patches in the glsl2-lower-variable-indexing were squashed
into this commit. These patches fix bugs in Luca's original
implementation, and the individual patches can be seen in that branch.
This was done to aid bisecting in the future.
Signed-off-by: Ian Romanick <ian.d.romanick@intel.com>
Dave Airlie [Fri, 17 Sep 2010 14:28:06 +0000 (00:28 +1000)]
r600g: oops got the use_mem_constant the wrong way around.
this fixes evergreen gears again.
Dave Airlie [Fri, 17 Sep 2010 05:27:58 +0000 (15:27 +1000)]
r600g: use calloc for ctx bo allocations
since the reference code relies on these being NULL.
Dave Airlie [Fri, 17 Sep 2010 04:36:18 +0000 (14:36 +1000)]
r600g: fixup map flushing.
long lived maps were getting removed when they shouldn't this
tries to avoid that problem by only adding to the flush list
on unmap.
Dave Airlie [Fri, 17 Sep 2010 04:01:50 +0000 (14:01 +1000)]
r600g: add upload manager support.
this add support for the upload manager for uploading user vbo/index buffers.
this provides a considerable speedup in q3 type games.
Dave Airlie [Fri, 17 Sep 2010 03:37:31 +0000 (13:37 +1000)]
r600g: add winsys bo caching.
this adds the bo caching layer and uses it for vertex/index/constant bos.
ctx needs to take references on hw bos so the flushing works okay, also
needs to flush the maps.
Dave Airlie [Fri, 17 Sep 2010 03:18:42 +0000 (13:18 +1000)]
r600g: add support for kernel bo
this moves to using a pb bufmgr instead of kernel bos directly.
Dave Airlie [Fri, 17 Sep 2010 02:51:04 +0000 (12:51 +1000)]
r600g: use malloc bufmgr for constant buffers
Dave Airlie [Fri, 17 Sep 2010 02:47:49 +0000 (12:47 +1000)]
r600g: move constant buffer creation behind winsys abstraction.
this paves the way for moving to pb bufmgrs now.
Chia-I Wu [Thu, 16 Sep 2010 05:29:26 +0000 (13:29 +0800)]
libgl-xlib: Remove unused st_api_create_OpenGL.
st/egl no longer relies on libGL for OpenGL support.
Chia-I Wu [Thu, 16 Sep 2010 04:42:53 +0000 (12:42 +0800)]
targets/egl: Use C++ compiler to link GL/ES state trackers.
Otherwise, applications compiled with C compiler might have trouble
using them.
Francisco Jerez [Fri, 17 Sep 2010 03:29:48 +0000 (05:29 +0200)]
dri/nv10: Fix the CLAMP texture wrap mode.
Brian Paul [Fri, 17 Sep 2010 01:02:42 +0000 (19:02 -0600)]
tgsi/sse: fix aos_to_soa() loop to handle num_inputs==0
Basically, change the loop from:
do {...} while (--num_inputs != 0)
into:
while (num_inputs != 0) { ... --num_inputs; }
Fixes fd.o bug 29987.
Dave Airlie [Thu, 16 Sep 2010 10:22:09 +0000 (20:22 +1000)]
r600g: attempt to abstract kernel bos from pipe driver.
introduce an abstraction layer between kernel bos and the winsys BOs.
this is to allow plugging in pb manager with minimal disruption to pipe driver.
Dave Airlie [Thu, 16 Sep 2010 07:18:39 +0000 (17:18 +1000)]
r600g: hide radeon_ctx inside winsys.
no need for this info to be exported to pipe driver.
Vinson Lee [Thu, 16 Sep 2010 22:34:24 +0000 (15:34 -0700)]
gallivm: Remove unnecessary header.
Brian Paul [Thu, 16 Sep 2010 15:16:58 +0000 (09:16 -0600)]
gallivm: fix wrong return value in bitwise functions
José Fonseca [Thu, 16 Sep 2010 10:45:16 +0000 (11:45 +0100)]
gallivm: Clamp indirect register indices to file_max.
Prevents crashes with bogus data, or bad shader translation.
José Fonseca [Thu, 16 Sep 2010 10:44:01 +0000 (11:44 +0100)]
gallivm: Start collecting bitwise arithmetic helpers in a new module.
José Fonseca [Thu, 16 Sep 2010 08:52:20 +0000 (09:52 +0100)]
gallivm: Fix address register swizzle.
We're actually doing a double swizzling:
indirect_reg->Swizzle[indirect_reg->SwizzleX]
instead of simply
indirect_reg->SwizzleX
Francisco Jerez [Thu, 16 Sep 2010 17:52:30 +0000 (10:52 -0700)]
meta: Don't bind the created texture object in init_temp_texture().
This function is executed outside _mesa_meta_begin/end(), that means
that e.g. _mesa_meta_Bitmap() clobbers the texturing state because it
changes the currently active texture object.
There's no need to bind the new texture when it's created, it's done
again later anyway (from setup_drawpix/copypix_texture()).
Signed-off-by: Brian Paul <brianp@vmware.com>
Brian Paul [Thu, 16 Sep 2010 18:40:05 +0000 (12:40 -0600)]
mesa: include mfeatures.h in formats.c
Otherwise, FEATURE_EXT_texture_sRGB was undefined.
This is (part of?) the fix for fd.o bug 30177.
Marek Olšák [Thu, 16 Sep 2010 00:04:37 +0000 (02:04 +0200)]
r300g/swtcl: fix CS overrun
https://bugs.freedesktop.org/show_bug.cgi?id=29901
Francisco Jerez [Wed, 15 Sep 2010 16:03:59 +0000 (18:03 +0200)]
dri/nouveau: Cleanup references to the old FBOs on glMakeCurrent().
Francisco Jerez [Wed, 15 Sep 2010 14:44:06 +0000 (16:44 +0200)]
dri/nouveau: Don't reemit the BO state in nouveau_state_emit().
Francisco Jerez [Tue, 14 Sep 2010 19:29:44 +0000 (21:29 +0200)]
dri/nouveau: Don't request a fake front unnecessarily.
Francisco Jerez [Wed, 15 Sep 2010 04:05:53 +0000 (06:05 +0200)]
dri/nouveau: Fix glRenderbufferStorage with DEPTH_COMPONENT as internal format.
Francisco Jerez [Thu, 16 Sep 2010 15:19:08 +0000 (17:19 +0200)]
dri/nouveau: Add some more extensions.
Francisco Jerez [Tue, 14 Sep 2010 19:22:45 +0000 (21:22 +0200)]
dri/nouveau: Update nouveau_class.h.
Francisco Jerez [Thu, 16 Sep 2010 15:16:19 +0000 (17:16 +0200)]
dri/nv04: Fix provoking vertex.
Francisco Jerez [Thu, 16 Sep 2010 15:15:38 +0000 (17:15 +0200)]
dri/nv04: Fix maximum texture size.
Francisco Jerez [Thu, 16 Sep 2010 15:15:05 +0000 (17:15 +0200)]
dri/nv04: Fix up color mask.
Francisco Jerez [Wed, 15 Sep 2010 04:09:21 +0000 (06:09 +0200)]
dri/nv04: Align SIFM transfer dimensions.
Francisco Jerez [Tue, 14 Sep 2010 23:56:04 +0000 (01:56 +0200)]
dri/nv04: Mipmapping fixes.
Francisco Jerez [Tue, 14 Sep 2010 22:38:58 +0000 (00:38 +0200)]
dri/nv04: Fix PGRAPH_ERRORs when running OA.
Andrew Randrianasulu [Tue, 14 Sep 2010 02:29:52 +0000 (04:29 +0200)]
dri/nv04: Enable eng3dm for A8/L8 textures.
Signed-off-by: Francisco Jerez <currojerez@riseup.net>
Andrew Randrianasulu [Tue, 14 Sep 2010 18:59:44 +0000 (20:59 +0200)]
dri/nv04: Don't expose ARB_texture_env_combine/dot3.
Signed-off-by: Francisco Jerez <currojerez@riseup.net>
Keith Whitwell [Thu, 16 Sep 2010 14:16:27 +0000 (15:16 +0100)]
llvmpipe: add DEBUG_FS to dump variant information
Keith Whitwell [Thu, 16 Sep 2010 09:45:52 +0000 (10:45 +0100)]
llvmpipe: add LP_PERF flag to disable various aspects of rasterization
Allows disabling various operations (mainly texture-related, but
will grow) to try & identify bottlenecks.
Unlike LP_DEBUG, this is active even in release builds - which is
necessary for performance investigation.
Keith Whitwell [Thu, 16 Sep 2010 11:31:42 +0000 (12:31 +0100)]
gallivm: make lp_build_sample_nop public
Brian Paul [Thu, 16 Sep 2010 15:00:54 +0000 (09:00 -0600)]
gallivm: move i32_vec_type inside the #ifdef
Brian Paul [Thu, 16 Sep 2010 14:56:22 +0000 (08:56 -0600)]
gallivm: fix incorrect vector shuffle datatype
The permutation vector must always be a vector of int32 values.
Christoph Bumiller [Thu, 16 Sep 2010 12:47:44 +0000 (14:47 +0200)]
nv50: get shader fixups/relocations into working state
Christoph Bumiller [Wed, 15 Sep 2010 22:51:32 +0000 (00:51 +0200)]
nv50: don't segfault on shaders with 0 instructions
Kenneth Graunke [Thu, 16 Sep 2010 09:55:02 +0000 (02:55 -0700)]
glsl: Don't print blank (function ...) headers for built-ins.
Fixes a regression caused when I added my GLSL ES support.
Kenneth Graunke [Thu, 16 Sep 2010 09:52:25 +0000 (02:52 -0700)]
glsl: Change from has_builtin_signature to has_user_signature.
The print visitor needs this, and the only existing user can work with
has_user_signature just as well.
Tilman Sauerbeck [Fri, 10 Sep 2010 16:24:01 +0000 (18:24 +0200)]
r600g: Use clamped math for RCP and RSQ.
This is likely only correct for OpenGL and not other state trackers.
Signed-off-by: Tilman Sauerbeck <tilman@code-monkey.de>
Tilman Sauerbeck [Fri, 10 Sep 2010 13:20:15 +0000 (15:20 +0200)]
r600g: Fixed a bo leak in r600_blit_state_ps_shader().
We would leak the newly created bo if it cannot be mapped.
Signed-off-by: Tilman Sauerbeck <tilman@code-monkey.de>
Chia-I Wu [Tue, 7 Sep 2010 16:30:27 +0000 (00:30 +0800)]
st/xlib: Notify the context when the front/back buffers are swapped.
The current context should be notified when the the front/back buffers
of the current drawable are swapped. The notification was skipped when
xmesa_strict_invalidate is false (the default).
This fixes fdo bug #29774.
Chia-I Wu [Wed, 15 Sep 2010 14:37:40 +0000 (22:37 +0800)]
mesa: Update ES APIspec.xml.
Enable some extensions now that the needed tokens are defined in
GLES/glext.h and GLES2/glext.h. Update the prototype of MultiDrawArrays
now that the prototype of _mesa_MultiDrawArraysEXT has been updated.
Dave Airlie [Thu, 16 Sep 2010 11:48:02 +0000 (21:48 +1000)]
r600g: fix texture bos and avoid doing depth blit on evergreen
since the depth blit code is hardcoded hex yay \o/
Dave Airlie [Thu, 16 Sep 2010 11:29:08 +0000 (21:29 +1000)]
r600g: fixup texture state on evergreen.
This whole set of state just seems wrong, another cut-n-paste nightmare.
Vinson Lee [Thu, 16 Sep 2010 01:47:17 +0000 (18:47 -0700)]
mesa/st: Silence uninitialized variable warning.
Vinson Lee [Thu, 16 Sep 2010 01:26:06 +0000 (18:26 -0700)]
nv50: Fix 'control reaches end of non-void function' warning.
Vinson Lee [Thu, 16 Sep 2010 01:24:28 +0000 (18:24 -0700)]
nv50: Silence uninitialized variable warnings.
Vinson Lee [Thu, 16 Sep 2010 01:17:51 +0000 (18:17 -0700)]
draw: Remove unnecessary header.
Vinson Lee [Thu, 16 Sep 2010 01:14:18 +0000 (18:14 -0700)]
gallivm: Remove unnecessary headers.
Vinson Lee [Thu, 16 Sep 2010 00:27:50 +0000 (17:27 -0700)]
nv50: Silence uninitialized variable warning.
Vinson Lee [Thu, 16 Sep 2010 00:24:50 +0000 (17:24 -0700)]
nv50: Silence uninitialized variable warning.
Vinson Lee [Thu, 16 Sep 2010 00:09:59 +0000 (17:09 -0700)]
nv50: Silence uninitialized variable warning.
Vinson Lee [Wed, 15 Sep 2010 23:51:39 +0000 (16:51 -0700)]
nv50: Remove unnecessary headers.
Vinson Lee [Wed, 15 Sep 2010 23:46:04 +0000 (16:46 -0700)]
nv50: Update files in SConscript to match Makefile.