OSDN Git Service
Stéphane Marchesin [Wed, 29 Jun 2011 03:45:07 +0000 (20:45 -0700)]
Gallium:draw:aaline and aapoint: Restore the old hooks when we destroy our stage.
Kenneth Graunke [Wed, 15 Jun 2011 06:13:27 +0000 (23:13 -0700)]
glsl: Don't use MOD_TO_FRACT lowering on GLSL 1.30's % operator.
MOD_TO_FRACT was designed to lower the GLSL 1.20 mod() function, which
operates on floating point values. However, we also use ir_binop_mod
for GLSL 1.30's % operator, which operates on integers.
For now, make MOD_TO_FRACT only apply to floating-point mod operations.
In the future, we may want to add a lowering pass for integer-based mod.
Signed-off-by: Kenneth Graunke <kenneth@whitecape.org>
Reviewed-by: Ian Romanick <ian.d.romanick@intel.com>
Reviewed-by: Eric Anholt <eric@anholt.net>
Kenneth Graunke [Wed, 15 Jun 2011 05:47:04 +0000 (22:47 -0700)]
glsl: Fix DIV_TO_MUL_RCP lowering for uint result types.
f2i results in an int/ivec; we need i2u to get a uint/uvec.
Signed-off-by: Kenneth Graunke <kenneth@whitecape.org>
Reviewed-by: Ian Romanick <ian.d.romanick@intel.com>
Reviewed-by: Eric Anholt <eric@anholt.net>
Kenneth Graunke [Wed, 15 Jun 2011 05:21:41 +0000 (22:21 -0700)]
glsl: Distinguish "type mismatch" error messages for modulus operator.
Previously, it would simply say "type error" in three different cases:
- The LHS is not an integer
- The RHS is not an integer
- The LHS and RHS have different base types (int vs. uint)
Now the error messages state the specific problem.
Signed-off-by: Kenneth Graunke <kenneth@whitecape.org>
Reviewed-by: Ian Romanick <ian.d.romanick@intel.com>
Reviewed-by: Eric Anholt <eric@anholt.net>
Kenneth Graunke [Tue, 14 Jun 2011 23:28:32 +0000 (16:28 -0700)]
glsl: Find the "closest" signature when there are multiple matches.
Previously, ir_function::matching_signature had a fatal bug: if a
function had more than one non-exact match, it would simply return NULL.
This occured, for example, when looking for max(uvec3, uvec3):
- max(vec3, vec3) -> score 1 (found first)
- max(ivec3, ivec3) -> score 1 (found second...used to return NULL here)
- max(uvec3, uvec3) -> score 0 (exact match...the right answer)
This did not occur for max(ivec3, ivec3) since the second match found
was an exact match.
The new behavior is to return a match with the lowest score. If there
is an exact match, that will be returned. Otherwise, a match with the
least number of implicit conversions is chosen.
Fixes piglit tests max-uvec3.vert and glsl-inexact-overloads.shader_test.
NOTE: This is a candidate for the 7.10 and 7.11 branches.
Signed-off-by: Kenneth Graunke <kenneth@whitecape.org>
Reviewed-by: Ian Romanick <ian.d.romanick@intel.com>
Reviewed-by: Eric Anholt <eric@anholt.net>
Kenneth Graunke [Wed, 15 Jun 2011 06:23:49 +0000 (23:23 -0700)]
glsl: Use i2u and u2i to implement constructor conversions.
Inspired by a patch from Bryan Cain <bryancain3@gmail.com>.
Fixes piglit tests:
- ctor-int-uint.vert
- ctor-ivec4-uvec4.vert
- ctor-uint-int.vert
- ctor-uvec4-ivec4.vert
Signed-off-by: Kenneth Graunke <kenneth@whitecape.org>
Reviewed-by: Ian Romanick <ian.d.romanick@intel.com>
Reviewed-by: Eric Anholt <eric@anholt.net>
Kenneth Graunke [Tue, 14 Jun 2011 20:04:32 +0000 (13:04 -0700)]
i965/fs: Implement new ir_unop_u2i and ir_unop_i2u opcodes.
No MOV is necessary since signed/unsigned integers share the same
bit-representation; it's simply a question of interpretation. In
particular, the fs_reg::imm union shouldn't need updating.
Signed-off-by: Kenneth Graunke <kenneth@whitecape.org>
Reviewed-by: Ian Romanick <ian.d.romanick@intel.com>
Reviewed-by: Eric Anholt <eric@anholt.net>
Kenneth Graunke [Wed, 15 Jun 2011 04:41:10 +0000 (21:41 -0700)]
ir_to_mesa: "Support" u2f, i2u, and u2i operations by doing nothing.
Mesa IR actually stores all numbers as floating point, so this is
totally a farce, but we may as well keep it going.
Signed-off-by: Kenneth Graunke <kenneth@whitecape.org>
Reviewed-by: Ian Romanick <ian.d.romanick@intel.com>
Reviewed-by: Eric Anholt <eric@anholt.net>
Kenneth Graunke [Tue, 14 Jun 2011 19:40:09 +0000 (12:40 -0700)]
glsl: Revert "fix conversions from uint to bool and from..."
Reverts commit
f41e1db3273a31285360241c4342f0a403ee0b03
"fix conversions from uint to bool and from float/bool to uint"
f2i, b2i, and b2i should not accept uint types. Use i2u and u2i.
Reviewed-by: Ian Romanick <ian.d.romanick@intel.com>
Reviewed-by: Eric Anholt <eric@anholt.net>
Bryan Cain [Wed, 15 Jun 2011 06:34:11 +0000 (23:34 -0700)]
glsl: Add ir_unop_i2u and ir_unop_u2i operations.
These are necessary to handle int/uint constructor conversions. For
example, the following code currently results in a type mismatch:
int x = 7;
uint y = uint(x);
In particular, uint(x) still has type int.
This commit simply adds the new operations; it does not generate them,
nor does it add backend support for them.
Signed-off-by: Kenneth Graunke <kenneth@whitecape.org>
Reviewed-by: Ian Romanick <ian.d.romanick@intel.com>
Reviewed-by: Eric Anholt <eric@anholt.net>
Eric Anholt [Fri, 24 Jun 2011 20:21:29 +0000 (13:21 -0700)]
glsl: Use the default values of ir_assignment() in lower_mat_op_to_vec.
Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
Eric Anholt [Fri, 24 Jun 2011 20:17:07 +0000 (13:17 -0700)]
glsl: Allow ir_assignment() constructor to not specify condition.
We almost never want to specify a condition, and when we do we're
already thinking about it (because we're writing a lowering pass
generating the condition), so a default argument should make the code
more pleasant to read.
NOTE: This is a candidate for the 7.11 branch (we want to be able to
cherry-pick future code).
Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
Eric Anholt [Fri, 24 Jun 2011 19:20:09 +0000 (12:20 -0700)]
glsl: Avoid making a temporary for lower_mat_op_to_vec if not needed.
Our copy propagation tends to be bad at handling the later array
accesses of the matrix argument we moved to a temporary. Generally we
don't need to move it to a temporary, though, so this avoids needing
more copy propagation complexity.
Reduces instruction count of some Unigine Tropics and Sanctuary
fragment shaders that do operations on uniform matrix arrays by 5.9%
on gen6.
Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
Eric Anholt [Fri, 24 Jun 2011 19:08:56 +0000 (12:08 -0700)]
glsl: Make lower_mat_op_to_vec track derefs, not variables.
We were constrained to using temporaries because we were assuming
variables all over. This simplifies things a bit.
Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
Eric Anholt [Fri, 24 Jun 2011 21:19:57 +0000 (14:19 -0700)]
glsl: Rename lower_mat_op_to_vec operands/results to be less hungarian.
This awkward typing was to avoid shadowing the function argument (the
matrix) with the temporary deref (the column) before the
get_column()/get_element()s were moved into the expression/assignment
constructors. They're about to become not-variables, so the current
names had to go. This change is almost mechanical (other than
column_expr), so it should make the next diff clearer.
Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
Eric Anholt [Fri, 24 Jun 2011 19:16:03 +0000 (12:16 -0700)]
glsl: Move get_{column,element} to expression args.
I think this makes the code more obvious by moving the declarations to
their single usage (now that we aren't using them to get at the ->type
field for expression constructors).
Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
Eric Anholt [Fri, 24 Jun 2011 19:11:35 +0000 (12:11 -0700)]
glsl: Drop explicit types of lower_mat_op_to_vec expressions.
The constructor can figure it out for us these days.
Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
Adam Jackson [Thu, 28 Apr 2011 12:54:45 +0000 (08:54 -0400)]
drisw: Remove cargo culting that breaks GLX 1.3 ctors
Signed-off-by: Adam Jackson <ajax@redhat.com>
Adam Jackson [Thu, 31 Mar 2011 20:43:57 +0000 (20:43 +0000)]
glx: Verify that drawable creation on the client side actually worked
... and clean up if it didn't.
Signed-off-by: Adam Jackson <ajax@redhat.com>
Adam Jackson [Thu, 2 Jun 2011 20:29:59 +0000 (16:29 -0400)]
glx: Alias glXFreeContextEXT to glXDestroyContext
Signed-off-by: Adam Jackson <ajax@redhat.com>
Kenneth Graunke [Wed, 29 Jun 2011 17:53:51 +0000 (10:53 -0700)]
i965/gen7: Add missing ! to brw->gs.prog_active assertion.
A typo in commit
c173541d9769 accidentally removed the !.
It's supposed to assert that there is _not_ an active GS program.
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=38762
Signed-off-by: Kenneth Graunke <kenneth@whitecape.org>
Brian Paul [Wed, 29 Jun 2011 13:37:11 +0000 (07:37 -0600)]
mesa: bump version to 7.12 (devel)
Brian Paul [Wed, 29 Jun 2011 13:35:07 +0000 (07:35 -0600)]
configs: add libdrm cflags to linux-llvm config
Jon TURNEY [Wed, 29 Jun 2011 11:43:11 +0000 (12:43 +0100)]
i915g: Move definition of M_PI in i915_fpc_translate.c
Move defintion of M_PI (for the benefit of <math.h> which do not define it), to
before the first use of it
Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk>
Reviewed-by: Brian Paul <brianp@vmware.com>
Brian Paul [Wed, 29 Jun 2011 13:23:45 +0000 (07:23 -0600)]
st/mesa: s/tex_usage/bindings/ in st_format.h
Just be consistent with the .c file.
Emil Velikov [Tue, 28 Jun 2011 17:47:41 +0000 (18:47 +0100)]
st/mesa: Use correct internal target
Commit
1a339b6c(st/mesa: prefer native texture formats when possible)
introduced two new arguments to the st_choose_format() functions.
This patch fixes the order and passes the correct internal_target
rather than GL_NONE
NOTE: This is a candidate for the 7.11 branch
Signed-off-by: Emil Velikov <emil.l.velikov@gmail.com>
Signed-off-by: Brian Paul <brianp@vmware.com>
Thomas Hellstrom [Wed, 29 Jun 2011 12:49:57 +0000 (14:49 +0200)]
st/glx: Fix compilation error
Fix compilation error due to commit
"Rework how drawables are invalidated v3"
Signed-off-by: Thomas Hellstrom <thellstrom@vmware.com>
Andre Maasikas [Mon, 27 Jun 2011 15:03:27 +0000 (18:03 +0300)]
st/mesa: fix overwriting gl_format with pipe_format since
9d380f48
fixes assert later on in texcompress2/r600g
Signed-off-by: Brian Paul <brianp@vmware.com>
Thomas Hellstrom [Tue, 28 Jun 2011 12:07:51 +0000 (14:07 +0200)]
st/dri: Get rid of the evil struct dri_drawable::context member
It's incorrect to assume a single context bound to a drawable.
Signed-off-by: Thomas Hellstrom <thellstrom@vmware.com>
Thomas Hellstrom [Wed, 29 Jun 2011 07:00:23 +0000 (09:00 +0200)]
st-api: Rework how drawables are invalidated v3.
The api and the state tracker manager code as well as the state tracker code
assumed that only a single context could be bound to a drawable. That is not
a valid assumption, since multiple contexts can bind to the same drawable.
Fix this by making it the state tracker's responsibility to update all
contexts binding to a drawable
Note that the state trackers themselves don't use atomic stamps on
frame-buffers. Multiple context rendering to the same drawable should
be protected by the application.
Signed-off-by: Thomas Hellstrom <thellstrom@vmware.com>
Stéphane Marchesin [Wed, 29 Jun 2011 08:23:44 +0000 (01:23 -0700)]
i915g: Fix unimplemented Abs comment.
Stéphane Marchesin [Wed, 29 Jun 2011 03:38:07 +0000 (20:38 -0700)]
i915g: If we have a program, that means the other fields are ours and we can free them.
Otherwise they probably belong to draw.
Stéphane Marchesin [Wed, 29 Jun 2011 03:36:35 +0000 (20:36 -0700)]
i915g: Don't overflow the program buffer.
Otherwise it corrupts other fields of the struct and hilarity ensues.
Stéphane Marchesin [Wed, 29 Jun 2011 03:18:57 +0000 (20:18 -0700)]
i915g: Update the TODO with another idea.
Paul Berry [Fri, 24 Jun 2011 22:34:04 +0000 (15:34 -0700)]
glsl: Rewrote _mesa_glsl_process_extension to use table-driven logic.
Instead of using a chain of manually maintained if/else blocks to
handle "#extension" directives, we now consult a table that specifies,
for each extension, the circumstances under which it is available, and
what flags in _mesa_glsl_parse_state need to be set in order to
activate it.
This makes it easier to add new GLSL extensions in the future, and
fixes the following bugs:
- Previously, _mesa_glsl_process_extension would sometimes set the
"_enable" and "_warn" flags for an extension before checking whether
the extension was supported by the driver; as a result, specifying
"enable" behavior for an unsupported extension would sometimes cause
front-end support for that extension to be switched on in spite of
the fact that back-end support was not available, leading to strange
failures, such as those in
https://bugs.freedesktop.org/show_bug.cgi?id=38015.
- "#extension all: warn" and "#extension all: disable" had no effect.
Notes:
- All extensions are currently marked as unavailable in geometry
shaders. This should not have any adverse effects since geometry
shaders aren't supported yet. When we return to working on geometry
shader support, we'll need to update the table for those extensions
that are available in geometry shaders.
- Previous to this commit, if a shader mentioned
ARB_shader_texture_lod, extension ARB_texture_rectangle would be
automatically turned on in order to ensure that the types
sampler2DRect and sampler2DRectShadow would be defined. This was
unnecessary, because (a) ARB_shader_texture_lod works perfectly well
without those types provided that the builtin functions that
reference them are not called, and (b) ARB_texture_rectangle is
enabled by default in non-ES contexts anyway. I eliminated this
unnecessary behavior in order to make the behavior of all extensions
consistent.
NOTE: This is a candidate for the 7.10 and 7.11 branches.
Reviewed-by: Ian Romanick <ian.d.romanick@intel.com>
Paul Berry [Fri, 24 Jun 2011 19:33:30 +0000 (12:33 -0700)]
glsl: Changed extension enable bits to bools.
These were previously 1-bit-wide bitfields. Changing them to bools
has a negligible performance impact, and allows them to be accessed by
offset as well as by direct structure access.
NOTE: This is a candidate for the 7.10 and 7.11 branches.
Reviewed-by: Ian Romanick <ian.d.romanick@intel.com>
Paul Berry [Tue, 28 Jun 2011 16:42:24 +0000 (09:42 -0700)]
glsl: permit explicit locations on fragment shader outputs, not inputs
From the OpenGL docs for GL_ARB_explicit_attrib_location:
This extension provides a method to pre-assign attribute locations to
named vertex shader inputs and color numbers to named fragment shader
outputs.
This was accidentally implemented for fragment shader inputs. This
patch fixes it to apply to fragment shader outputs.
Fixes piglit tests
spec/ARB_explicit_attrib_location/1.{10,20}/compiler/layout-{01,03,06,07,08,09,10}.frag
Reviewed-by: Ian Romanick <ian.d.romanick@intel.com>
NOTE: This is a candidate for the 7.10 and 7.11 branches.
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=38624
Stéphane Marchesin [Tue, 28 Jun 2011 19:07:11 +0000 (12:07 -0700)]
i915g: Fix comment about sin/cos constants.
Stéphane Marchesin [Tue, 28 Jun 2011 19:04:45 +0000 (12:04 -0700)]
i915g: Fix staging texture uploads a bit.
They still look corrupted, but at least now they don't look tiled any more.
Eric Anholt [Sun, 19 Jun 2011 19:04:46 +0000 (12:04 -0700)]
i965: Reissue PIPELINE_POINTERS and BINDING_TABLE_POINTERS on SBA change.
This was a requirement we didn't run into until we started using
STATE_BASE_ADDRESS for instruction data.
Eric Anholt [Sun, 19 Jun 2011 18:33:40 +0000 (11:33 -0700)]
i965/gen6: Fix scissors using invalid STATE_BASE_ADDRESS.
The scissor state was incorrectly in a .prepare function instead of
.emit, so the packet would end up in the batch before the
STATE_BASE_ADDRESS. It appears that this doesn't actually hurt, as
the scissor address gets dereferenced according to the current SBA at
draw time.
Alan Hourihane [Tue, 28 Jun 2011 16:40:24 +0000 (17:40 +0100)]
glx: Check HAVE_XF86VIDMODE before adding it as an implicit link
library.
Jon TURNEY [Tue, 26 Apr 2011 10:56:02 +0000 (11:56 +0100)]
Don't use -fvisibilty=hidden on cygwin
All it's going to do is generate lots and lots and lots of
'warning: visibility attribute not supported in this configuration; ignored'
warnings
Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk>
Reviewed-by: Dan Nicholson <dbn.lists@gmail.com>
Jon TURNEY [Tue, 26 Apr 2011 10:49:01 +0000 (11:49 +0100)]
Fix config check that claims to test if CXX supports -fvisibility=hidden option to actually test the C++ compiler.
Reviewed-by: Dan Nicholson <dbn.lists@gmail.com>
Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk>
Stéphane Marchesin [Tue, 28 Jun 2011 09:14:43 +0000 (02:14 -0700)]
i915g: Add a debug_printf when we get the Abs flag.
Stéphane Marchesin [Tue, 28 Jun 2011 08:41:57 +0000 (01:41 -0700)]
i915g: Support PIPE_FORMAT_B10G10R10A2_UNORM.
Stéphane Marchesin [Tue, 28 Jun 2011 07:53:01 +0000 (00:53 -0700)]
i915g: Improve SIN/COS a bit.
Stéphane Marchesin [Tue, 28 Jun 2011 06:00:16 +0000 (23:00 -0700)]
i915g: When emulating LUMINANCE8 and INTENSITY8 texutres, route alpha properly.
That fixes some formats in fbo-alphatest-formats.
Stéphane Marchesin [Tue, 28 Jun 2011 05:40:03 +0000 (22:40 -0700)]
i915g: fix shadow compare.
"Works" as well as i915c now.
Chia-I Wu [Tue, 28 Jun 2011 06:23:20 +0000 (15:23 +0900)]
targets/egl-static: fix library search order
Use
$(MKLIB) -ldflags '-L$(TOP)/$(LIB_DIR)'
instead of
$(MKLIB) -L$(TOP)/$(LIB_DIR)
to make sure the local library path appears before system's.
Chia-I Wu [Tue, 28 Jun 2011 01:22:01 +0000 (10:22 +0900)]
st/egl: update fbdev backend
Considering fbdev as an in-kernel window system,
- opening a device opens a connection
- there is only one window: the framebuffer
- fb_var_screeninfo decides window position, size, and even color format
- there is no pixmap
Now EGL is built on top of this window system. So we should have
- the fd as the handle of the native display
- reject all but one native window: NULL
- no pixmap support
modeset support is still around, but it should be removed soon.
Stéphane Marchesin [Tue, 28 Jun 2011 02:24:42 +0000 (19:24 -0700)]
i915g: Enable GL_ARB_instanced_arrays.
Stéphane Marchesin [Tue, 28 Jun 2011 01:27:50 +0000 (18:27 -0700)]
i915g: Fix a bug in facing.
However doesn't work because of limitations in the draw module.
Ben Widawsky [Thu, 16 Jun 2011 23:53:04 +0000 (16:53 -0700)]
i965: step message register allocation
The system routine requires m0 be reserved for saving off architectural
state. Moved the allocation to start at 2 instead of 0.
Signed-off-by: Ben Widawsky <ben@bwidawsk.net>
Reviewed-by: Eric Anholt <eric@anholt.net>
Ian Romanick [Thu, 2 Jun 2011 19:42:48 +0000 (12:42 -0700)]
glsl: Fix depth unbalancing problem in if-statement flattening
Previously, if max_depth were 1, the following code would see the
first if-statement (correctly) not get flattened, but the second
if-statement would (incorrectly) get flattened:
void main()
{
if (a)
gl_Position = vec4(0);
if (b)
gl_Position = vec4(1);
}
This is because the visit_leave(ir_if*) method would not decrement the
depth before returning on the first if-statement.
NOTE: This is a candidate for the 7.10 and 7.11 branches.
Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
Stéphane Marchesin [Mon, 27 Jun 2011 09:08:44 +0000 (02:08 -0700)]
i915g: Remove unused cbuf_dirty.
Stéphane Marchesin [Mon, 27 Jun 2011 09:05:10 +0000 (02:05 -0700)]
i915g: Add a comment about a bug.
Stéphane Marchesin [Mon, 27 Jun 2011 09:04:38 +0000 (02:04 -0700)]
i915g: initial support for SEMANTIC_FACE.
Doesn't work yet, see TODO.
Stéphane Marchesin [Mon, 27 Jun 2011 09:03:45 +0000 (02:03 -0700)]
i915g: update TODO.
Stéphane Marchesin [Mon, 27 Jun 2011 02:38:12 +0000 (19:38 -0700)]
i915g: Return the max result for the fake occlusion queries.
Stéphane Marchesin [Mon, 27 Jun 2011 02:17:04 +0000 (19:17 -0700)]
i915g: Fix depth texture formats.
Depth compare still looks broken though.
Stéphane Marchesin [Mon, 27 Jun 2011 02:09:02 +0000 (19:09 -0700)]
i915g: Fix u_blitter comment.
Stéphane Marchesin [Sun, 26 Jun 2011 20:40:54 +0000 (13:40 -0700)]
i915g: Implement fake DDX/DDY.
Stéphane Marchesin [Sun, 26 Jun 2011 12:01:24 +0000 (05:01 -0700)]
i915g: Fix gl_FragCoord.
Benjamin Franzke [Mon, 27 Jun 2011 08:23:34 +0000 (10:23 +0200)]
egl: Fix Terminate with shared gbm screens
NOTE: This is a candidate for the 7.11 branch.
Chia-I Wu [Mon, 27 Jun 2011 02:47:27 +0000 (11:47 +0900)]
st/d3d1x: fix for st/egl native.h interface change
The interface was changed in
73df31eedd0f33c8a9907855cb247c8f87964c48.
Marek Olšák [Mon, 27 Jun 2011 01:12:57 +0000 (03:12 +0200)]
configure.ac: sort Gallium directories alphabetically
Chia-I Wu [Sun, 26 Jun 2011 09:03:15 +0000 (18:03 +0900)]
targets/egl-static: fix building without libudev
Thanks to José for pointing out.
Chia-I Wu [Sat, 25 Jun 2011 22:58:16 +0000 (07:58 +0900)]
targets/egl-static: refactor drm_fd_get_screen_name
Add drm_fd_get_pci_id to get the PCI ID. Fix a leak with udev on error.
Chia-I Wu [Sat, 25 Jun 2011 23:02:13 +0000 (08:02 +0900)]
st/egl: fix a compile error
It is triggered when --with-driver=xlib is specified.
Chia-I Wu [Sat, 25 Jun 2011 22:36:26 +0000 (07:36 +0900)]
targets/gbm: attemp to fix unresolved symbols
Move system libraries (usually .so) out of --start-group / --end-group
pair. Add possiblly missing archives, defines, and shared libraries.
Marek Olšák [Sat, 25 Jun 2011 05:20:20 +0000 (07:20 +0200)]
r300g: drop support for ARGB, ABGR, XRGB, XBGR render targets
Blending and maybe even alpha-test don't work with those formats.
Only supporting RGBA, BGRA, RGBX, BGRX.
NOTE: This is a candidate for the 7.10 and 7.11 branches.
Brian Paul [Sat, 25 Jun 2011 12:17:01 +0000 (06:17 -0600)]
Revert "Fix 24bpp software rendering"
This reverts commit
c0c0bb6cb140825f5bab3c40c0c9c0ec575fbc76.
Chia-I Wu [Sat, 25 Jun 2011 09:28:20 +0000 (18:28 +0900)]
egl: fix EGL_MATCH_NATIVE_PIXMAP
EGL_MATCH_NATIVE_PIXMAP is valid for eglChooseConfig, but invalid for
eglGetConfigAttrib.
Chia-I Wu [Sat, 25 Jun 2011 07:44:11 +0000 (16:44 +0900)]
st/egl: add get_pixmap_format callback to native_display
And use it for EGL_MATCH_NATIVE_PIXMAP. Remove is_pixmap_supported
meanwhile.
Chia-I Wu [Sat, 25 Jun 2011 08:32:15 +0000 (17:32 +0900)]
egl: make implementing eglChooseConfig easier
Add a new helper function, _eglFilterConfigArray, for drivers and hide
_eglSortConfigs.
Chia-I Wu [Sat, 25 Jun 2011 09:09:18 +0000 (18:09 +0900)]
targets/egl-static: do not use DRI_LIB_DEPS
It brings in libraries that are not necessarily needed.
Chia-I Wu [Sat, 25 Jun 2011 07:18:11 +0000 (16:18 +0900)]
st/egl: add a fast path for ximage eglCopyBuffers
Chia-I Wu [Sat, 25 Jun 2011 06:48:24 +0000 (15:48 +0900)]
st/egl: clean up eglCopyBuffers
Add copy_to_pixmap method to native_display and use it for
eglCopyBuffers.
Chia-I Wu [Sat, 25 Jun 2011 05:52:57 +0000 (14:52 +0900)]
st/egl: reorganize backend initialization
Remove set_event_handler() and pass the event handler with
native_get_XXX_platform(). Add init_screen() so that the pipe screen is
created later. This way we don't need to pass user_data to
create_display().
Stéphane Marchesin [Sat, 25 Jun 2011 02:51:25 +0000 (19:51 -0700)]
i915g: always upload the vs constants.
This fixes a crash in llvm draw.
Eric Anholt [Fri, 24 Jun 2011 22:40:51 +0000 (15:40 -0700)]
i965/gen5: Fix grf_used calculation for 16-wide.
If we happened to allocate a texture result (or other vector) to the
highest hardware register slot, and we were in 16-wide, we would
under-count the registers used and potentially wrap around to g0 if
that allocation crossed a 16-register block boundary. Bad rendering
and hangs ensued.
Tested-by: Ian Romanick <idr@freedesktop.org>
Stéphane Marchesin [Sat, 25 Jun 2011 00:18:12 +0000 (17:18 -0700)]
i915g: add fake occlusion queries.
Those always return 0, but at least we don't crash when exposing GL 2.0.
Stéphane Marchesin [Fri, 24 Jun 2011 23:41:09 +0000 (16:41 -0700)]
i915g: Don't do shader fixup if no surface is bound.
Stéphane Marchesin [Fri, 24 Jun 2011 23:18:58 +0000 (16:18 -0700)]
i915g: Fix point sprites.
Brian Paul [Fri, 24 Jun 2011 00:44:42 +0000 (18:44 -0600)]
indices: fix conversion of PIPE_PRIM_POLYGON to lines
When the fill mode is PIPE_POLYGON_MODE_LINE we were basically
converting the polygon into triangles, then drawing the outline of all
the triangles. But we really only want to draw the lines around the
perimeter of the polygon, not the interior lines.
NOTE: This is a candidate for the 7.10 branch.
Paul Berry [Sun, 12 Jun 2011 17:47:46 +0000 (10:47 -0700)]
i965: fix mask used to write to clip distance registers when gen>6
In gen6 and above, clip distances 0-3 are written to message register
3's xyzw components, and 4-7 to message register 4's xyzw components.
Therefore when when writing the clip distances we need to examine the
lower 2 bits of the clip distance index to see which component to
write to.
emit_vertex_write() was examining the lower 3 bits, causing clip
distances 4-7 not to be written correctly.
Fixes piglit test vs-clip-vertex-01.shader_test
Alex Deucher [Fri, 24 Jun 2011 22:27:39 +0000 (18:27 -0400)]
r600g: limit fs_write_all shader rebuild to eg+
Signed-off-by: Alex Deucher <alexdeucher@gmail.com>
Alex Deucher [Fri, 24 Jun 2011 22:05:53 +0000 (18:05 -0400)]
r600g: eg+ support for FS_COLOR0_WRITES_ALL_CBUFS
Evergreen+ don't support multi-writes so we need to emulate
it in the shader. Fixes the following piglit tests:
fbo-drawbuffers-fragcolor
ati_draw_buffers-arbfp-no-option
Signed-off-by: Alex Deucher <alexdeucher@gmail.com>
Chad Versace [Thu, 23 Jun 2011 08:20:19 +0000 (01:20 -0700)]
intel: Fix workaround for _mesa_update_framebuffer
In intel_draw_buffer, there exists a workaround to prevent
_mesa_update_framebuffer from creating a swrast depth wrapper when
using separate stencil. This commit fixes the workaround, which was
incomplete for s8z24 texture renderbuffers.
Fixes fbo-blit-d24s8 on gen5 with separate stencil manually enabled.
Signed-off-by: Chad Versace <chad@chad-versace.us>
Chad Versace [Thu, 23 Jun 2011 00:52:22 +0000 (17:52 -0700)]
intel: Change framebuffer validation criteria
Since all infrastructure is now in place to support packed
depth/stencil renderbuffers when using separate stencil, there is no
need for special cases when separate stencil is enabled.
Signed-off-by: Chad Versace <chad@chad-versace.us>
Chad Versace [Thu, 23 Jun 2011 02:44:53 +0000 (19:44 -0700)]
intel: In intel_update_wrapper, support s8z24 textures when using separate stencil
Also, in order to coerce intel_update_tex_wrapper_regions() to
allocate the hiz region, alter intel_update_tex_wrapper_regions() to
examine the renderbuffer format instead of the texture image format.
Signed-off-by: Chad Versace <chad@chad-versace.us>
Chad Versace [Wed, 22 Jun 2011 23:08:49 +0000 (16:08 -0700)]
intel: Factor region updates out of intel_update_wrapper
... and into new function intel_update_tex_wrapper_regions.
This prevents code duplication in the next commit.
Also add a note explaining that the hiz region is broken for mipmapped
depth textures.
Signed-off-by: Chad Versace <chad@chad-versace.us>
Chad Versace [Tue, 21 Jun 2011 22:54:27 +0000 (15:54 -0700)]
intel: During glTexImage, allocate renderbuffers for faking s8z24 textures
... when using separate stencil.
Define function intel_tex_image_x8z24_create_renderbuffers and call it
in intelTexImage after the miptree has been created and filled with data.
Signed-off-by: Chad Versace <chad@chad-versace.us>
Chad Versace [Wed, 22 Jun 2011 17:26:26 +0000 (10:26 -0700)]
intel: Declare some functions in intel_fbo.c as non-static
... because they will be needed by intel_tex_image_s8z24_create_renderbuffers.
Redeclared functions are:
intel_alloc_renderbuffer_storage
intel_renderbuffer_set_draw_offsets
Signed-off-by: Chad Versace <chad@chad-versace.us>
Chad Versace [Tue, 21 Jun 2011 21:06:13 +0000 (14:06 -0700)]
intel: Change signature of intel_create_wrapped_renderbuffer
Redeclare as non-static because
intel_tex_image_s8z24_create_renderbuffers will use it.
Remove the 'wrapper' parameter, because there is no wrapper for
intel_texture_image.depth_rb and stencil_rb.
Signed-off-by: Chad Versace <chad@chad-versace.us>
Chad Versace [Wed, 22 Jun 2011 04:42:48 +0000 (21:42 -0700)]
intel: Perform gather on s8z24 texture images during glGetTexImage
Signed-off-by: Chad Versace <chad@chad-versace.us>
Chad Versace [Wed, 22 Jun 2011 05:58:39 +0000 (22:58 -0700)]
intel: Define functions intel_texture_s8z24_scatter/gather
... which copy the stencil bits between intel_image->depth_rb and
intel_image->stencil_rb.
Signed-off-by: Chad Versace <chad@chad-versace.us>
Chad Versace [Tue, 21 Jun 2011 20:44:57 +0000 (13:44 -0700)]
intel: Add fields to intel_texture for faking s8z24 with separate stencil
Add the fields depth_rb and stencil_rb, and put hooks in place to
release the renderbuffers in intelFreeTextureImageData and
intelTexImage.
Signed-off-by: Chad Versace <chad@chad-versace.us>
Stéphane Marchesin [Fri, 24 Jun 2011 21:07:31 +0000 (14:07 -0700)]
st/mesa: add PIPE_FORMAT_R8G8B8A8_UNORM as the first RGBA format.
Otherwise we can end up creating RGBA render targets (which are BGRA on the
hardware), and then we bind them as RGBA textures (which are RGBA on the
hardware). This generates software fallbacks every time we bind the frame as
a texture.