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.
Dave Airlie [Wed, 15 Sep 2010 23:41:43 +0000 (09:41 +1000)]
r600g: add vgt dma src defines
Dave Airlie [Wed, 15 Sep 2010 23:39:29 +0000 (09:39 +1000)]
r600g: use index min/max + index buffer offset.
more prep work for fixing up buffer handling
Dave Airlie [Wed, 15 Sep 2010 23:33:34 +0000 (09:33 +1000)]
r600g: pull r600_draw struct out into header
we need this for future buffer rework, it also makes the vtbl easier
Brian Paul [Wed, 15 Sep 2010 23:04:26 +0000 (17:04 -0600)]
gallivm: expand AoS sampling to cover all filtering modes
...and all texture targets (1D/2D/3D/CUBE).
Brian Paul [Wed, 15 Sep 2010 19:56:00 +0000 (13:56 -0600)]
tgsi: fix incorrect usage_mask for shadow tex instructions
The shadow versions of the texture targets use an extra component
(Z) to express distance from light source to the fragment.
Fixes the shadowtex demo with llvmpipe.
Brian Paul [Wed, 15 Sep 2010 18:51:09 +0000 (12:51 -0600)]
nv50: use unsigned int for bitfields to silence warnings
Brian Paul [Wed, 15 Sep 2010 18:49:11 +0000 (12:49 -0600)]
llvmpipe: s/boolean/unsigned/ in bitfield to silence warning
Using non-int types for bitfields is a gcc extension.
The size of the struct is not effected by this change.
Brian Paul [Wed, 15 Sep 2010 18:48:29 +0000 (12:48 -0600)]
llvmpipe: cast to silence warning
Brian Paul [Wed, 15 Sep 2010 18:47:32 +0000 (12:47 -0600)]
glsl2: fix signed/unsigned comparison warning
John Doe [Wed, 15 Sep 2010 15:47:32 +0000 (11:47 -0400)]
r600g: misc cleanup
Avoid using r600_screen structure to get ptr to radeon
winsys structure.
Signed-off-by: Jerome Glisse <jglisse@redhat.com>
Christoph Bumiller [Wed, 15 Sep 2010 15:34:40 +0000 (17:34 +0200)]
Merge remote branch 'origin/nv50-compiler'
Conflicts:
src/gallium/drivers/nouveau/nouveau_class.h
src/gallium/drivers/nv50/nv50_screen.c
Keith Whitwell [Wed, 15 Sep 2010 15:28:49 +0000 (16:28 +0100)]
llvmpipe: return zero from floor_pot(zero)
Christoph Bumiller [Wed, 15 Sep 2010 13:21:41 +0000 (15:21 +0200)]
nv50: put low limit on REG_ALLOC_TEMP and FP_RESULT_COUNT
Christoph Bumiller [Wed, 15 Sep 2010 11:59:09 +0000 (13:59 +0200)]
nv50: improve and fix modifier folding optimization
Execute before folding loads, because we don't check if it's legal
in lower_mods.
Ensure that a value's insn pointer is updated when transferring it
to a different instruction.
Christoph Bumiller [Mon, 13 Sep 2010 19:13:36 +0000 (21:13 +0200)]
nv50: consider address register in reload elimination
Keith Whitwell [Wed, 15 Sep 2010 10:51:41 +0000 (11:51 +0100)]
llvmpipe: remove duplicate code
Bad rebase presumably.
Keith Whitwell [Sun, 5 Sep 2010 15:11:25 +0000 (16:11 +0100)]
llvmpipe: brackets around macro arg
Chia-I Wu [Wed, 15 Sep 2010 13:12:38 +0000 (21:12 +0800)]
glapi: Fix ES build errors again.
This fixes an error in GLAPI ES. My build is ok with or without this
patch, and the error affects others' setups.
[Patch from Francesco Marella]
Vinson Lee [Wed, 15 Sep 2010 13:13:31 +0000 (06:13 -0700)]
r600g: Silence unused variable warning.
The code that uses dname is currently ifdef'ed out.
Vinson Lee [Wed, 15 Sep 2010 13:09:28 +0000 (06:09 -0700)]
r600g: Silence uninitialized variable warning.
Vinson Lee [Wed, 15 Sep 2010 12:52:16 +0000 (05:52 -0700)]
r600g: Silence uninitialized variable warning.
Vinson Lee [Wed, 15 Sep 2010 12:46:34 +0000 (05:46 -0700)]
r600g: Silence uninitialized variable warning.
Vinson Lee [Wed, 15 Sep 2010 12:43:50 +0000 (05:43 -0700)]
nvfx: Silence uninitialized variable warnings.
Vinson Lee [Wed, 15 Sep 2010 12:34:29 +0000 (05:34 -0700)]
r600g: Silence uninitialized variable warning.
Vinson Lee [Wed, 15 Sep 2010 12:31:31 +0000 (05:31 -0700)]
r600g: Silence uninitialized variable warning.
Vinson Lee [Wed, 15 Sep 2010 12:17:57 +0000 (05:17 -0700)]
glsl: Fix 'format not a string literal and no format arguments' warning.
Fix the following GCC warning.
loop_controls.cpp: In function 'int calculate_iterations(ir_rvalue*, ir_rvalue*, ir_rvalue*, ir_expression_operation)':
loop_controls.cpp:88: warning: format not a string literal and no format arguments
Dave Airlie [Wed, 15 Sep 2010 10:58:14 +0000 (20:58 +1000)]
r300g: fix buffer reuse issue caused by previous commit
caused by
0b9eb5c9bb03e5134d9a41786178100109e80c5a
test run glxgears, resize.
Chia-I Wu [Wed, 15 Sep 2010 09:43:21 +0000 (17:43 +0800)]
glapi: Fix build errors for ES.
The latest glext.h defines GL_FIXED. Test GL_OES_fixed_point instead to
decide whether to define GLfixed and GLclampx.
This fixes fdo bug #30205.
Andre Maasikas [Wed, 15 Sep 2010 08:08:24 +0000 (11:08 +0300)]
r600c: fix buffer height setting in dri2 case
fbHeight is 0 in this case
uncovered by changes in
b0bc026c and should fix kernel rejecting command
streams after that commit
Marek Olšák [Wed, 15 Sep 2010 01:46:10 +0000 (03:46 +0200)]
r300g: prevent creating multiple winsys BOs for the same handle
This fixes a DRM deadlock in the cubestorm xscreensaver, because somehow
there must not be 2 different BOs relocated in one CS if both BOs back
the same handle. I was told it is impossible to happen, but apparently
it is not, or there is something else wrong.
Vinson Lee [Wed, 15 Sep 2010 00:54:46 +0000 (17:54 -0700)]
mesa: Include missing header in program.h.
Include compiler.h for ASSERT symbol.
Vinson Lee [Wed, 15 Sep 2010 00:42:47 +0000 (17:42 -0700)]
r600g: Remove unnecessary headers.
Luca Barbieri [Tue, 14 Sep 2010 19:45:01 +0000 (21:45 +0200)]
auxiliary: fix unintended fallthrough
Vinson Lee [Tue, 14 Sep 2010 21:23:17 +0000 (14:23 -0700)]
llvmpipe: Remove unnecessary header.
Brian Paul [Tue, 14 Sep 2010 17:01:03 +0000 (11:01 -0600)]
glx: add const qualifiers to __indirect_glMultiDrawArraysEXT()
Andre Maasikas [Tue, 14 Sep 2010 15:56:39 +0000 (18:56 +0300)]
r600c: fix setting negative values to bitfields
when setting negative integers to bitfields we could overwrite
other parts of it. So mask the value to be written correctly.
This is used quite often in the driver - hope it doesnt affect
performace or uncover behaviour relied before...
fixes strange effects when setting negative lodbias on evergreen
Brian Paul [Tue, 14 Sep 2010 15:40:23 +0000 (09:40 -0600)]
mesa: upgrade wglext.h to version 22
Brian Paul [Tue, 14 Sep 2010 15:39:44 +0000 (09:39 -0600)]
mesa: upgrade glxext.h to version 32
Brian Paul [Tue, 14 Sep 2010 15:37:35 +0000 (09:37 -0600)]
mesa: update to version 64 of GL/glext.h
A number of other files had to be updated as well because const
qualifiers were added to the glMultiDrawArrays() function.
Also, GL_FIXED is now defined in glext.h.
Brian Paul [Tue, 14 Sep 2010 15:16:40 +0000 (09:16 -0600)]
mesa: move, redefine MESA_GEOMETRY_PROGRAM
Brian Paul [Tue, 14 Sep 2010 15:15:19 +0000 (09:15 -0600)]
glsl2: add case for ir_unop_noise
Silences a compiler warning. Still need to add some assertions
for this case.
Brian Paul [Tue, 14 Sep 2010 15:05:46 +0000 (09:05 -0600)]
glsl2: fix comments
Chia-I Wu [Mon, 13 Sep 2010 05:20:25 +0000 (13:20 +0800)]
mesa: Remove unnecessary FEATURE tests.
Remove all FEATURE tests in mesa/drivers/common/. They are not needed
and the code looks better without them.
Chia-I Wu [Mon, 13 Sep 2010 05:35:12 +0000 (13:35 +0800)]
mesa: Less FEATURE_ARB_sync tests.
Add dummy static inline definitions to syncobj.h when FEATURE_ARB_sync
is 0, and remove most FEATURE_ARB_sync tests.
Chia-I Wu [Mon, 13 Sep 2010 05:51:52 +0000 (13:51 +0800)]
mesa: Remove unused _MESA_INIT_*_FUNCTIONS.
They were intended to be used to build OpenGL ES only DRI drivers, but
that never happened.
Vinson Lee [Tue, 14 Sep 2010 07:42:20 +0000 (00:42 -0700)]
gallivm: Remove unnecessary header.
Vinson Lee [Tue, 14 Sep 2010 07:17:13 +0000 (00:17 -0700)]
llvmpipe: Initialize variable for potentially unhandled switch case.
Vinson Lee [Tue, 14 Sep 2010 07:08:45 +0000 (00:08 -0700)]
i965g: Fix 'control reaches end of non-void function' warning.
Fixes the following GCC warning.
brw_screen.c: In function 'brw_get_shader_param':
brw_screen.c:241: warning: control reaches end of non-void function
Vinson Lee [Tue, 14 Sep 2010 06:58:42 +0000 (23:58 -0700)]
i915g: Fix 'control reaches end of non-void function' warning.
Fixes the following GCC warning.
i915_screen.c: In function 'i915_get_shader_param':
i915_screen.c:184: warning: control reaches end of non-void function
Vinson Lee [Tue, 14 Sep 2010 06:42:35 +0000 (23:42 -0700)]
i915: Fix "implicit declaration of function 'draw_get_shader_param'" warning.
Fixes the following GCC warning.
i915_screen.c: In function 'i915_get_shader_param':
i915_screen.c:147: warning: implicit declaration of function 'draw_get_shader_param'
Vinson Lee [Tue, 14 Sep 2010 06:23:34 +0000 (23:23 -0700)]
identity: Fix 'assignment from incompatible pointer type' warning.
This is a follow-up to commit
a508d2dddcc67d0f92cc36b9ed6f36a9bbfc579d.
Fixes the following GCC warning.
id_screen.c: In function 'identity_screen_create':
id_screen.c:317: warning: assignment from incompatible pointer type
Vinson Lee [Tue, 14 Sep 2010 06:02:37 +0000 (23:02 -0700)]
rbug: Fix 'assignment from incompatible pointer type' warning.
This is a follow-up to commit
a508d2dddcc67d0f92cc36b9ed6f36a9bbfc579d.
Fixes the following GCC warning.
rbug_screen.c: In function 'rbug_screen_create':
rbug_screen.c:331: warning: assignment from incompatible pointer type
Luca Barbieri [Tue, 14 Sep 2010 03:10:59 +0000 (05:10 +0200)]
mesa/st: ask GLSL to not emit noise since we have a dummy implementation
Note, BTW, that the Gallium implementation returns 0.5, which seems
to violate the GLSL spec, where it should return 0.0 instead.
Not sure whether changing it to 0 is correct or not.
Luca Barbieri [Mon, 6 Sep 2010 00:31:20 +0000 (02:31 +0200)]
mesa/st: set compiler options based on Gallium shader caps
This turns on if conversion and unlimited loop unrolling if control
flow is not supported.
NOTE: this will change the behavior of r300g and any other driver
that doesn't advertise control flow