Eric Anholt [Mon, 22 Jun 2009 15:52:52 +0000 (08:52 -0700)]
i965: Fix warnings in intel_pixel_read.c.
Michel Dänzer [Mon, 22 Jun 2009 12:40:51 +0000 (14:40 +0200)]
intel: Fix glReadPixels regression since changing context init order.
Fixes regression in
dd26899ca39111e0866afed9df94bfb1618dd363 that also
affected some PBO operations.
Eric Anholt [Sat, 20 Jun 2009 05:12:52 +0000 (22:12 -0700)]
intel: Also get the DRI2 front buffer when doing front buffer reading.
Eric Anholt [Sat, 20 Jun 2009 05:03:37 +0000 (22:03 -0700)]
intel: Update Mesa state before span setup in glReadPixels.
We could have mapped the wrong set of draw buffers. Noticed while looking
into a DRI2 glean ReadPixels issue.
Eric Anholt [Sat, 20 Jun 2009 04:43:22 +0000 (21:43 -0700)]
intel: Move intel_pixel_read.c to shared for use with i965.
Eric Anholt [Sat, 20 Jun 2009 00:14:27 +0000 (17:14 -0700)]
intel: Don't map regions with drm_intel_gem_bo_map_gtt() unless they're tiled.
This fixes a regression in region read performance that came in with the
texture tiling changes. Ideally we'd have an access flag coming in so we
could also use bo_map_gtt for writing, like we do for buffer objects.
Bug #22190
Eric Anholt [Fri, 19 Jun 2009 22:57:03 +0000 (15:57 -0700)]
intel: Fix other metaops versus GL_COMPILE_AND_EXECUTE dlists.
Fixes oglconform zbfunc.c and pxtrans-cidraw.c, at least.
Eric Anholt [Fri, 19 Jun 2009 22:49:24 +0000 (15:49 -0700)]
intel: Fix glClear behavior versus display lists.
The CALL_DrawArrays was leaking the clear's primitives into the display
list with GL_COMPILE_AND_EXECUTE. Use _mesa_DrawArrays instead, which
doesn't appear to leak. Fixes piglit dlist-clear test.
Eric Anholt [Fri, 19 Jun 2009 22:36:50 +0000 (15:36 -0700)]
mesa: Make VBO dlist printing use the same path as other dlist printing.
I was rather confused when mesa_print_display_list didn't show any of
my glBegin()..glEnd(). Nothing but print_list appears to call
this function, so matching its behavior seems like a good idea.
Chia-I Wu [Thu, 18 Jun 2009 05:42:24 +0000 (13:42 +0800)]
intel: Do not access pbo's buffer directly when attaching.
pbo might be system buffer based or attached to another region. Call
intel_bufferobj_buffer to make sure pbo has a buffer of its own.
Signed-off-by: Chia-I Wu <olvaffe@gmail.com>
Signed-off-by: Eric Anholt <eric@anholt.net>
Chia-I Wu [Thu, 18 Jun 2009 05:42:23 +0000 (13:42 +0800)]
intel: Data are copied in the wrong direction when breaking COW tie.
Signed-off-by: Chia-I Wu <olvaffe@gmail.com>
Signed-off-by: Eric Anholt <eric@anholt.net>
Chia-I Wu [Thu, 18 Jun 2009 05:42:22 +0000 (13:42 +0800)]
intel: Fix migration from sys_buffer in intel_bufferobj_buffer.
intel_bufferobj_subdata is called to migrate data from sys_buffer, and
it expects only one of buffer or sys_buffer is non-NULL.
Signed-off-by: Chia-I Wu <olvaffe@gmail.com>
Signed-off-by: Eric Anholt <eric@anholt.net>
Roland Scheidegger [Fri, 19 Jun 2009 22:27:36 +0000 (00:27 +0200)]
radeon: make cubemap mipmap generation work
need to pass target parameter to radeon_teximage/radeon_subteximage functions
otherwise mipmap generation for cube maps can't work (assert/segfault in
_mesa_generate_mipmap)
Roland Scheidegger [Fri, 19 Jun 2009 22:24:03 +0000 (00:24 +0200)]
demos: make cubemap work without EXT_fbo support
use SGIS_generate_mipmap if EXT_fbo support (for manual mipmap generation)
is not available.
Michel Dänzer [Fri, 19 Jun 2009 21:55:55 +0000 (23:55 +0200)]
intel: Fixups for 'mesa: create/destroy buffer objects via driver functions'.
Initialize all driver function hooks before calling _mesa_initialize_context(),
and handle all buffer objects in intel_buffer_object().
Fixes assertion failure when running glxinfo.
Roland Scheidegger [Fri, 19 Jun 2009 20:55:34 +0000 (22:55 +0200)]
radeon: fix cube maps for non-mm path
drm cmd checker would refuse cube emits
also fix an issue in the cs path which would calculate the register
offset off by one dword.
Only same testing done as original code (none except compile tested).
Brian Paul [Fri, 19 Jun 2009 20:42:37 +0000 (14:42 -0600)]
st/mesa: restore some parameter checking buffer object functions
These functions may be called from the VBO code (not just user GL calls)
so do some parameter sanity checking.
Roland Scheidegger [Fri, 19 Jun 2009 20:32:06 +0000 (22:32 +0200)]
r200: fix cube maps for non-mm path
drm cmd checker rightfully fell over any cube emit
Brian Paul [Thu, 18 Jun 2009 15:26:18 +0000 (09:26 -0600)]
i965: initial code for loops in vertex programs
Brian Paul [Thu, 18 Jun 2009 15:23:58 +0000 (09:23 -0600)]
i965: asst clean-ups, etc in brw_vs_emit()
Brian Paul [Thu, 18 Jun 2009 15:20:55 +0000 (09:20 -0600)]
i965: asst clean-ups, var renaming in brw_wm_emit_glsl()
Brian Paul [Fri, 19 Jun 2009 18:19:15 +0000 (12:19 -0600)]
st/mesa: remove redundant st_buffer_object::size field and error checks
Just use the gl_buffer_object::Size field. Remove unnecessary size/offset
error checks. Core Mesa will have already done these checks before these
functions are called.
Brian Paul [Fri, 19 Jun 2009 18:12:54 +0000 (12:12 -0600)]
st/mesa: no longer special-case buffer object 0 in st_buffer_object() cast wrapper
Since commit
6629a35559ff7e3b993966f697f7c7f68e5a38d9 "mesa: create/destroy
buffer objects via driver functions" this is no longer needed, and actually
was causing a crash during context tear-down.
Roland Scheidegger [Fri, 19 Jun 2009 18:00:55 +0000 (20:00 +0200)]
radeons: use dp4 for position invariant vertex programs
Fixes #22181. R200 requires this since DP4 is used in hw tnl mode.
R300 prefers it (should be faster due to no instruction dependencies), but
both methods should be correct (when sw tcl is used though, MUL/MAD might
be faster). Probably doesn't make much difference for R100 since vertex progs
are executed in software anyway, but let's just keep it the same there too.
Brian Paul [Fri, 19 Jun 2009 16:05:08 +0000 (10:05 -0600)]
mesa: make query-related driver fallback functions static
Plug them in via _mesa_init_query_object_functions().
Brian Paul [Fri, 19 Jun 2009 16:00:03 +0000 (10:00 -0600)]
mesa: make buffer object-related driver fallback functions static
Plug them in via _mesa_init_buffer_object_functions().
Brian Paul [Fri, 19 Jun 2009 15:58:51 +0000 (09:58 -0600)]
mesa: create/destroy buffer objects via driver functions
Brian Paul [Fri, 19 Jun 2009 15:48:43 +0000 (09:48 -0600)]
i965simple: use u_reduced_prim() function
Brian Paul [Fri, 19 Jun 2009 15:45:23 +0000 (09:45 -0600)]
draw: use u_reduced_prim() function
Brian Paul [Fri, 19 Jun 2009 15:42:37 +0000 (09:42 -0600)]
softpipe: use u_reduced_prim()
Brian Paul [Fri, 19 Jun 2009 15:39:56 +0000 (09:39 -0600)]
gallium/util: s/boolean/unsigned/
Brian Paul [Fri, 19 Jun 2009 15:38:12 +0000 (09:38 -0600)]
softpipe: whitespace, reformatting
Brian Paul [Fri, 19 Jun 2009 15:15:34 +0000 (09:15 -0600)]
Merge branch 'ext-provoking-vertex'
Conflicts:
docs/relnotes-7.6.html
progs/tests/Makefile
src/gallium/drivers/softpipe/sp_prim_vbuf.c
src/glx/x11/indirect.c
src/mesa/glapi/Makefile
src/mesa/glapi/dispatch.h
src/mesa/glapi/glapioffsets.h
src/mesa/glapi/glapitable.h
src/mesa/glapi/glapitemp.h
src/mesa/glapi/glprocs.h
src/mesa/main/dlist.c
src/mesa/main/enums.c
src/mesa/sparc/glapi_sparc.S
src/mesa/x86-64/glapi_x86-64.S
src/mesa/x86/glapi_x86.S
Brian Paul [Fri, 19 Jun 2009 05:00:37 +0000 (23:00 -0600)]
draw: use flatfirst variable
Brian Paul [Fri, 19 Jun 2009 04:51:41 +0000 (22:51 -0600)]
draw: remove debug code
Brian Paul [Fri, 19 Jun 2009 04:48:51 +0000 (22:48 -0600)]
draw: fix first provoking vertex mode for quads, quad strips and polygons
Brian Paul [Fri, 19 Jun 2009 04:47:46 +0000 (22:47 -0600)]
draw: fix first provoking vertex mode for unfilled quads
Brian Paul [Fri, 19 Jun 2009 04:45:57 +0000 (22:45 -0600)]
mesa: fix first provoking vertex mode for unfilled tri strips
Brian Paul [Fri, 19 Jun 2009 00:33:29 +0000 (18:33 -0600)]
draw: clean up indentation
Thomas Hellstrom [Tue, 16 Jun 2009 23:08:25 +0000 (01:08 +0200)]
gallium dri st: Probe the driver for supported surface formats.
This is done when constructing the fbconfigs, and the result is saved
for window system framebuffer creation.
Note: For dri2 the server needs to have an identical format selection
logic. Otherwise the dri state-tracker and the xorg driver (state-tracker)
will disagree on which format to use for the attachments. Some more work
is needed in this area.
Signed-off-by: Thomas Hellstrom <thellstrom@vmware.com>
Thomas Hellstrom [Tue, 16 Jun 2009 15:52:05 +0000 (17:52 +0200)]
mesa driconf: Add macro to specify an option with a quoted default value.
The default values true and false will expand to "1" and "0" when
gcc -std=c99, causing bool option defaults to generate runtime failures.
One solution is to specify bool option defaults quoted as "true" and "false".
Add a macro to assist this.
Signed-off-by: Thomas Hellstrom <thellstrom@vmware.com>
Jakob Bornecrantz [Wed, 17 Jun 2009 13:45:52 +0000 (14:45 +0100)]
progs/rbug: Add small program to add block rules
Eric Anholt [Thu, 18 Jun 2009 03:46:12 +0000 (20:46 -0700)]
i965: Add decode for the G4X x,y offset in surface state.
Eric Anholt [Thu, 18 Jun 2009 03:53:27 +0000 (20:53 -0700)]
i965: Fix up texture layout for small things with wide pitches (tiled)
We were packing according to the pitch, while the hardware appears to base
it on the base level width.
With this and the previous commit, fbo-cubemap now matches untiled behavior.
Eric Anholt [Fri, 5 Jun 2009 23:16:44 +0000 (23:16 +0000)]
i965: Fall back or appropriately adjust offsets of drawing to tiled regions.
3D rendering to tiled textures was being done with non-tile-aligned offsets.
The G4X hardware has fields to let us support it easily and correctly, while
the pre-G4X hardware requires a path full of suffering, so we just fall back.
Dave Airlie [Thu, 18 Jun 2009 03:20:32 +0000 (13:20 +1000)]
r300: use vbo_split_prims to split up large vertex buffers.
This lets ut2004 avoid hitting the elt warning.
Eric Anholt [Fri, 12 Jun 2009 15:44:40 +0000 (08:44 -0700)]
i965: Fix tiling for FBO depth attachments by making DEPTH_COMPONENT Y tiled.
This may hurt if miptree relayout occurs, since we can't blit Y tiled
objects. But it corrects depth tests on FBOs using textures.
Dave Airlie [Thu, 18 Jun 2009 03:12:21 +0000 (13:12 +1000)]
radeon: don't re-add BOs to validate list
if its on the list its on the list don't go readding it.
multitexturing from the same texture could cause this.
Brian Paul [Wed, 17 Jun 2009 13:44:04 +0000 (07:44 -0600)]
glsl: call _mesa_postprocess_program(), disabled
Brian Paul [Wed, 17 Jun 2009 13:43:44 +0000 (07:43 -0600)]
mesa: silence warning
Brian Paul [Wed, 17 Jun 2009 13:42:49 +0000 (07:42 -0600)]
mesa: added _mesa_postprocess_program() to aid shader debugging
Jerome Glisse [Wed, 17 Jun 2009 14:33:14 +0000 (16:33 +0200)]
radeon: Flush command buffer on viewport change
We flush the command buffer so we don't emit mixed
state (with new and previous buffer size) command
buffer, this is especialy affecting zbuffer states.
Jerome Glisse [Wed, 17 Jun 2009 11:51:33 +0000 (13:51 +0200)]
r300: don't emit vap index offset on r5xx hw when using cs
vap index offset is programmed to 0 by the kernel, it
would add work to kernel checker to allow userspace
programming of this so it's now disallowed with CS
on KMS.
Dave Airlie [Thu, 11 Jun 2009 00:50:32 +0000 (10:50 +1000)]
GLX: attempt to fix glean makeCurrent test cases.
Two parts to this:
One we don't keep pointers to possibly freed memory anymore once we unbind the
drawables from the context. Brian I need to figure out what the comment
you made there, can we get a glean/piglit test so we can fix it properly?
If the new gc is the same as the oldGC, we call the unbind even though
we just bound it in that function. doh.
Dave Airlie [Wed, 17 Jun 2009 01:12:57 +0000 (11:12 +1000)]
radeon: fix warnings in wrapper with libdrm
Brian Paul [Wed, 17 Jun 2009 00:25:52 +0000 (18:25 -0600)]
Merge branch 'mesa_7_5_branch'
Conflicts:
src/mesa/main/api_validate.c
Brian Paul [Wed, 17 Jun 2009 00:19:45 +0000 (18:19 -0600)]
i965: fix bugs in projective texture coordinates
For the TXP instruction we check if the texcoord is really a 4-component
atttibute which requires the divide by W step. This check involved the
projtex_mask field. However, the projtex_mask field was being miscalculated
because of some confusion between vertex program outputs and fragment
program inputs.
1. Rework the size_masks calculation so we correctly set bits corresponding
to fragment program input attributes.
2. Rename projtex_mask to proj_attrib_mask since we're interested in more
than just texcoords (generic varying vars too).
3. Simply the indexing of the size_masks and proj_attrib_mask fields.
4. The tracker::active[] array was mis-dimensioned. Use MAX_PROGRAM_TEMPS
instead of a magic number.
5. Update comments, add new assertions.
With these changes the Lightsmark demo/benchmark renders correctly, until
we eventually hit a GPU lockup...
Brian Paul [Tue, 16 Jun 2009 21:41:49 +0000 (15:41 -0600)]
softpipe: fix out of bounds quad rasterization bug
For some triangles we can generate quads which lie just outside the
surface bounds. Just check the quad's mask before trying to emit/process
the quad.
Fixes failed assertion in Lightsmark.
Roland Scheidegger [Tue, 16 Jun 2009 19:38:58 +0000 (21:38 +0200)]
i965: handle OPCODE_SWZ in the glsl path
glsl compiler will not generate OPCODE_SWZ, and as a first step it would
be translated away to a MOV anyway (why?), but later internally this opcode is
generated (for EXT_texture_swizzling).
Brian Paul [Tue, 16 Jun 2009 15:34:35 +0000 (09:34 -0600)]
mesa: fix incorrect viewport clamping in _mesa_set_viewport()
A 0 by 0 viewport size is legal. Don't clamp against lower bound of one.
The error checking earlier in the function prevents negative values.
Brian Paul [Tue, 16 Jun 2009 14:45:06 +0000 (08:45 -0600)]
mesa: fix REMAINDER() macro
The results were incorrect for some negative values of A.
See bug 21872.
José Fonseca [Tue, 16 Jun 2009 12:05:25 +0000 (13:05 +0100)]
gallium: Avoid atomic ops / locking when src is dst.
José Fonseca [Tue, 16 Jun 2009 11:34:29 +0000 (12:34 +0100)]
progs/wgl: Quit after displaying usage for -h option.
José Fonseca [Tue, 16 Jun 2009 11:29:14 +0000 (12:29 +0100)]
progs/wgl: Use appropriate types to silence msvc warnings.
José Fonseca [Tue, 16 Jun 2009 11:28:26 +0000 (12:28 +0100)]
progs/wgl: Fix assertion failure in wglthreads' texture creation.
Brian Paul [Mon, 15 Jun 2009 22:44:26 +0000 (16:44 -0600)]
docs: minor relnotes clean-up
Brian Paul [Mon, 15 Jun 2009 22:42:42 +0000 (16:42 -0600)]
Merge branch 'arb_map_buffer_range'
Conflicts:
docs/relnotes-7.6.html
src/mesa/main/mtypes.h
Shuang He [Mon, 15 Jun 2009 22:19:30 +0000 (16:19 -0600)]
intel: Release fb backing regions in intelDestroyBuffer()
Fixes memory leak when destroying framebuffers.
José Fonseca [Mon, 15 Jun 2009 18:22:35 +0000 (19:22 +0100)]
python/tests: Add is_depth_stencil_format utility function.
José Fonseca [Mon, 15 Jun 2009 18:21:58 +0000 (19:21 +0100)]
python/tests: Cleanup texture_sample.
José Fonseca [Mon, 15 Jun 2009 18:20:25 +0000 (19:20 +0100)]
mesa: Always return a value.
José Fonseca [Mon, 15 Jun 2009 18:20:05 +0000 (19:20 +0100)]
mesa: Use appropriate float/integer types.
José Fonseca [Mon, 15 Jun 2009 18:19:29 +0000 (19:19 +0100)]
mesa: Use type modifier for float constants.
José Fonseca [Mon, 15 Jun 2009 18:17:07 +0000 (19:17 +0100)]
mesa: Use integer type with appropriate sign.
José Fonseca [Mon, 15 Jun 2009 18:04:04 +0000 (19:04 +0100)]
rtasm: Use 32bit constant.
As we're only using 32bit bitmasks.
José Fonseca [Mon, 15 Jun 2009 17:57:45 +0000 (18:57 +0100)]
gallium: Ensure assert macro is defined before being used in p_thread.h
José Fonseca [Mon, 15 Jun 2009 17:42:13 +0000 (18:42 +0100)]
softpipe: Fix softpipe_is_texture_referenced.
Render results are only visible when the render cache is flushed.
softpipe_is_texture_referenced must reflect that or transfers to/from the
textures bound in the framebuffer won't be proceeded of the necessary
flush, causing transfer data to be outdated/clobbered.
This fixes conform drawpix test with softpipe.
Brian Paul [Mon, 15 Jun 2009 16:58:04 +0000 (10:58 -0600)]
mesa: revert some recent VBO buffer object refcounting changes
Reverts part of commit
d7ea9ddf5824556e47decac7ba200f37cf1e552f.
We were calling _mesa_reference_buffer_object() on some heap-allocated
memory that was uninitialized and could trigger an assertion.
We can actually go back to "looser" ref counting of the Null/default
buffer object in these cases.
Brian Paul [Mon, 15 Jun 2009 16:47:07 +0000 (10:47 -0600)]
mesa: regenerated gl_mange.h file
Roland Scheidegger [Fri, 12 Jun 2009 18:09:07 +0000 (20:09 +0200)]
enable ARB_half_float_pixel for intel drivers
Roland Scheidegger [Sat, 23 May 2009 23:18:31 +0000 (01:18 +0200)]
intel: fix (cosmetic) typo flag used twice
José Fonseca [Mon, 15 Jun 2009 14:40:10 +0000 (15:40 +0100)]
progs/tests: Use opaque colors.
Transparency is not relevant for this example, and leads to distraction
due to different results in alpha visuals, when capturing images to disk.
Thomas Hellstrom [Wed, 10 Jun 2009 22:54:06 +0000 (00:54 +0200)]
dri st: Don't require the PIPE_TEXTURE_USAGE_RENDER_TARGET property for depth- and stencil renderbuffers.
Signed-off-by: Thomas Hellstrom <thellstrom-at-vmware-dot-com>
Thomas Hellstrom [Mon, 15 Jun 2009 09:43:48 +0000 (11:43 +0200)]
Merge branch 'mesa_7_5_branch'
Conflicts:
progs/util/extfuncs.h
Thomas Hellstrom [Mon, 15 Jun 2009 09:20:31 +0000 (11:20 +0200)]
gallium: Fix segfault and valgrind error introduced with commit
3f2e006b759705abd7c409d30f9aeb1f2a75b83f
Signed-off-by: Thomas Hellstrom <thellstrom-at-vmware-dot-com>
Maciej Cencora [Sun, 14 Jun 2009 23:06:40 +0000 (01:06 +0200)]
r300: fix 3D textures
Brian Paul [Fri, 12 Jun 2009 22:21:20 +0000 (16:21 -0600)]
i965: interpolate colors with perspective correction by default
...rather than with linear interpolation. Modern hardware should use
perspective-corrected interpolation for colors (as for texcoords).
glHint(GL_PERSPECTIVE_CORRECTION_HINT, mode) can be used to get
linear interpolation if mode = GL_FASTEST.
Brian Paul [Wed, 10 Jun 2009 19:46:04 +0000 (13:46 -0600)]
mesa: use larger initial refcount for NullBufferObj
Refcounting of the null/default buffer object isn't perfect yet so be
extra safe.
Brian Paul [Wed, 10 Jun 2009 19:45:01 +0000 (13:45 -0600)]
mesa: use _mesa_reference_buffer_object() in a few places
Brian Paul [Wed, 10 Jun 2009 19:44:35 +0000 (13:44 -0600)]
mesa: use _mesa_reference_buffer_object() in a few places
Brian Paul [Fri, 12 Jun 2009 21:58:34 +0000 (15:58 -0600)]
tests: added persp_hint.c test
Test the effect of GL_PERSPECTIVE_CORRECTION_HINT on color interpolation.
Dave Airlie [Fri, 12 Jun 2009 21:43:04 +0000 (07:43 +1000)]
add some info to relnotes on radeon
Maciej Cencora [Fri, 12 Jun 2009 17:08:44 +0000 (19:08 +0200)]
r300: add support for EXT_texture_sRGB
Tested with glean/texture_srgb and wine/d3d9 tests on RV535
Brian Paul [Fri, 12 Jun 2009 16:18:15 +0000 (10:18 -0600)]
set/mesa: enable GL_NV_texture_env_combine4
This is handled entirely in core Mesa where the combiner state is converted
into a fragment program.
Brian Paul [Thu, 11 Jun 2009 18:10:00 +0000 (12:10 -0600)]
tests: added arbgpuprog, for compile-testing ARB vertex/fragment programs
Brian Paul [Thu, 11 Jun 2009 15:48:38 +0000 (09:48 -0600)]
st/mesa: additional debug code (disabled)
Brian Paul [Thu, 11 Jun 2009 21:50:47 +0000 (15:50 -0600)]
demos: update fbotexture.c to use EXT or ARB functions exclusively
When the -arb option is specified we use GL_ARB_framebuffer_object intead
of GL_EXT_framebuffer_object.
For some vendors' OpenGL it's important to call the ARB entrypoints
instead of the EXT entrypoints to get correct behaviour. Use some
function pointer tricks to do this (instead of GLEW).
Brian Paul [Thu, 11 Jun 2009 21:50:32 +0000 (15:50 -0600)]
util: additional function pointers
Jakob Bornecrantz [Fri, 12 Jun 2009 13:55:04 +0000 (14:55 +0100)]
progs/rbug: Add binary to bmp converter program
Jakob Bornecrantz [Fri, 12 Jun 2009 11:31:04 +0000 (12:31 +0100)]
Merge branch 'mesa_7_5_branch'