Commit graph

41604 commits

Author SHA1 Message Date
Ian Romanick
39ad7dc7b1 docs: Add 7.10.3 md5sums 2011-06-13 16:53:24 -07:00
Ian Romanick
2d0fd07037 docs: Add change log to 7.10.3 release notes 2011-06-13 16:22:29 -07:00
Ian Romanick
edbaa9e856 docs: Add list of bugs fixed in 7.10.3 release 2011-06-13 16:22:29 -07:00
Ian Romanick
a40eed0a10 mesa: Regenerate parser files from previous two commits 2011-06-13 16:22:17 -07:00
Eric Anholt
2b7ee98588 mesa: Add support for OPTION ATI_draw_buffers to ARB_fp.
Tested by piglit ati_draw_buffers-arbfp.
Reviewed-by: Brian Paul <brianp@vmware.com>
Reviewed-by: Ian Romanick <ian.d.romanick@intel.com>
(cherry picked from commit fb6e39737a)
2011-06-13 15:36:02 -07:00
Eric Anholt
ff07695e19 mesa: Add support for the ARB_fragment_program part of ARB_draw_buffers.
Fixes fbo-drawbuffers-arbfp.

Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=34321
Reviewed-by: Brian Paul <brianp@vmware.com>
Reviewed-by: Ian Romanick <ian.d.romanick@intel.com>
(cherry picked from commit 28cec9e832)
2011-06-13 15:35:55 -07:00
José Fonseca
fc23cc06af wgl: Don't hold on to user supplied HDC.
Certain applications (e.g., Bernina My Label, and the Windows
implementation of Processing language) destroy the device context used when
creating the frame-buffer, causing presents to fail because we were still
referring to the old device context internally.

This change ensures we always use the same HDC passed to the ICD
entry-points when available, or our own HDC when not available (necessary
only when flushing on single buffered visuals).
2011-06-12 09:16:00 +01:00
José Fonseca
195e15559e st/wgl: Remove buggy assertion.
The assertion is wrong, now that state tracker can cope with a window with
zero width or height.
2011-06-12 09:15:58 +01:00
José Fonseca
22bf0ec991 st/wgl: Allow to create pbuffers bigger than the desktop.
We use a hidden window for pbuffer contexts, but Windows limits window
sizes to the desktop size by default. This means that creating a big
pbuffer on a small resolution single monitor would truncate the pbuffer
size to the desktop.

This change overrides the windows maximum size, allow to create windows
arbitrarily large.
2011-06-12 09:15:52 +01:00
José Fonseca
3f3d199121 st/wgl: Cope with zero width/height windows.
While ensuring the framebuffer area is never zero.
2011-06-12 09:15:49 +01:00
José Fonseca
ac28843c1a st/wgl: Prevent spurious framebuffer sizes when the window is minimized.
When the window is minimized GetClientRect will return zeros.

Instead of creating a 1x1 framebuffer, simply preserve the current window
size, until the window is restored or maximized again.
2011-06-12 09:15:45 +01:00
José Fonseca
c78ac563f1 st/wgl: Fix debug output format specifiers of stw_framebuffer_get_size(). 2011-06-12 09:15:42 +01:00
José Fonseca
b6c601a5e8 st/wgl: Adjust the pbuffer invisible window size.
Thanks to Brian Paul for diagnosing the issue.
2011-06-12 09:15:35 +01:00
José Fonseca
27f6db0f38 gallivm: Fix for dynamically linked LLVM 2.8 library.
This prevents the error

    prog: for the -disable-mmx option: may only occur zero or one times!

when creating a new context after XCloseDisplay with DRI drivers linked
with a shared LLVM 2.8 library.
2011-06-12 09:13:24 +01:00
José Fonseca
c1da25aede gallivm: Tell LLVM to not assume a 16-byte aligned stack on x86.
Fixes fdo 36738.
2011-06-12 09:13:24 +01:00
Jeremy Huddleston
05d9a4ab1c osmesa: Fix missing symbols when GLX_INDIRECT_RENDERING is defined.
When GLX_INDIRECT_RENDERING is defined, some symbols are used in
libglapi.a but are not defined.  Define them through the help of
glapitemp.h.

Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
Signed-off-by: Chia-I Wu <olvaffe@gmail.com>
(cherry picked from commit 0e8d045bf8)
2011-06-11 22:16:43 -07:00
Marek Olšák
b0625f8486 mesa: return after invalidating renderbuffer
(cherry picked from commit a674ef7814)
2011-06-12 05:58:28 +02:00
Marek Olšák
b10abac70e mesa: invalidate framebuffer if internal format of renderbuffer is changed
RenderTexture doesn't have to be called in invalidate_rb, I guess.
(cherry picked from commit df818d572e)
2011-06-12 05:57:26 +02:00
Marek Olšák
7d30582c91 mesa: fix up assertion in _mesa_source_buffer_exists
This was probably missed when implementing luminance and luminance alpha
render targets.

_mesa_get_format_bits checks for both GL_*_BITS and GL_TEXTURE_*_SIZE.

This fixes:
main/framebuffer.c:892: _mesa_source_buffer_exists: Assertion `....' failed.
(cherry picked from commit c0110d5450)
2011-06-12 05:56:18 +02:00
Dave Airlie
08c47e4851 st/mesa: fix compressed mipmap generation.
If the underlying transfer had a stride wider for hw alignment reasons,
the mipmap generation would generate badly strided images.

this fixes a few problems I found while testing r600g with s3tc

Signed-off-by: Dave Airlie <airlied@redhat.com>

(cherry picked from commit fdb4373a20 by Marek)
This fixes the DXT1 tests from fbo-generatemipmap-formats on some drivers.
2011-06-12 05:45:07 +02:00
Ian Romanick
39865f5c46 mesa: Ignore blits to/from missing buffers
The EXT_framebuffer_object spec (and later specs) say:

     "If a buffer is specified in <mask> and does not exist in both
     the read and draw framebuffers, the corresponding bit is silently
     ignored."

Check for color, depth, and stencil that the source and destination
FBOs have the specified buffers.  If the buffer is missing, remove the
bit from the blit request mask and continue.

Fixes the crash in piglit test 'fbo-missing-attachment-blit from', and
fixes 'fbo-missing-attachment-blit es2 from'.

Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=37739
Reviewed-by: Brian Paul <brianp@vmware.com>
Reviewed-by: Eric Anholt <eric@anholt.net>

NOTE: This is a candidate for the stable branches.
(cherry picked from commit bb4758669c by Marek)
2011-06-12 05:29:18 +02:00
Ian Romanick
6586475f37 mesa: Don't try to clear a NULL renderbuffer
In an ES2 context (or if GL_ARB_ES2_compatibility) is supported, the
framebuffer can be complete with some attachments be missing.  In this
case the _ColorDrawBuffers pointer will be NULL.

Fixes the crash in piglit test fbo-missing-attachment-clear.

Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=37739
Reviewed-by: Brian Paul <brianp@vmware.com>
Reviewed-by: Eric Anholt <eric@anholt.net>

NOTE: This is a candidate for the stable branches.
(cherry picked from commit 7f9c17aaa8 by Marek)
2011-06-12 05:29:14 +02:00
Marek Olšák
b9f2eefd1d st/mesa: remove asserts in st_texture_image_copy
This is for 7.10 only. The fix in master looks too complex to be
cherry-picked.

The assertions fail when generating mipmaps for NPOT textures.

This fixes:
- fbo-generatemipmap-formats

Reviewed-by: Brian Paul <brianp@vmware.com>
2011-06-11 22:34:01 +02:00
Brian Paul
48a3b03409 mesa: bump version to 7.10.3 2011-06-10 15:25:38 -06:00
Brian Paul
29164dcac8 docs: 7.10.3 release notes skeleton file, links 2011-06-10 15:25:38 -06:00
Brian Paul
f2901d3f98 mesa: add include/c99/*.h files to tarballs
See https://bugs.freedesktop.org/show_bug.cgi?id=36238

NOTE: This is a candidate for the 7.10 branch.
2011-06-10 15:25:38 -06:00
Brian Paul
3b89e1c0e6 st/mesa: fix software accum buffer format bug 2011-06-10 15:25:38 -06:00
Brian Paul
8a78e6cf80 vbo: remove node->count > 0 test in vbo_save_playback_vertex_list()
See piglit dlist-fdo31590.c test and
http://bugs.freedesktop.org/show_bug.cgi?id=31590

In this case we had node->prim_count=1 but node->count==0 because the
display list started with glBegin() but had no vertices.  The call to
glEvalCoord1f() triggered the DO_FALLBACK() path.  When replaying the
display list, the old condition basically no-op'd the call to
vbo_save_playback_vertex_list call().  That led to the invalid operation
error being raised in glEnd().

NOTE: This is a candidate for the 7.10 branch.
(cherry picked from commit 62811057f4)
2011-06-10 13:09:41 -06:00
Brian Paul
788dda53cf vbo: check array indexes to prevent negative indexing
See the piglit dlist-fdo31590.c test

NOTE: This is a candidate for the 7.10 branch.
(cherry picked from commit f1cdce95f6)
2011-06-10 13:09:41 -06:00
Brian Paul
cc5d54e797 draw: fix edge flag handling in clipper (for unfilled tris/quads/polygons)
Previously, we were errantly drawing some interior edges of clipped
polygons and quads.  Also, we were introducing extra edges where
polygons intersected the view frustum clip planes.

The main problem was that we were ignoring the edgeflags encoded in
the primitive header's 'flags' field which are set during polygon/quad
->tri decomposition.  We need to observe those during clipping.  Since
we can't modify the existing vert's edgeflag fields, we need to store
them in a parallel array.

Edge flags also need to be handled differently for view frustum planes
vs. user-defined clip planes.  In the former case we don't want to draw
new clip edges but in the later case we do.  This matches NVIDIA's
behaviour and it just looks right.

Finally, note that the LLVM draw code does not properly set vertex
edge flags.  It's OK on the regular software path though.
(cherry picked from commit f6572017b9)
2011-06-10 13:09:40 -06:00
Brian Paul
59b147c6a3 st/mesa: fix incorrect texture level/face/slice accesses
If we use FBOs to access mipmap levels with glRead/Draw/CopyPixels()
we need to be sure to access the correct mipmap level/face/slice.
Before, we were just passing zero in quite a few places.

This fixes the new piglit fbo-mipmap-copypix test.

NOTE: This is a candidate for the 7.10 branch.
(cherry picked from commit bf14ab417c)

Conflicts:

	src/mesa/state_tracker/st_cb_drawpixels.c
2011-06-10 13:07:03 -06:00
Brian Paul
5ec931eb7d mesa: check that flex/bison are installed
Fixes https://bugs.freedesktop.org/show_bug.cgi?id=36651

NOTE: This is a candidate for the 7.10 branch.
(cherry picked from commit de1df26b5c)
2011-06-10 13:07:03 -06:00
Brian Paul
9c7e1b054d mesa: add some missing GLAPIENTRY keywords
NOTE: this is a candidate for the 7.10 branch.
(cherry picked from commit 3559440873)
2011-06-10 13:07:03 -06:00
Marek Olšák
3d5e6c4c1e r300g: clear can be killed by render condition
Fixes piglit:
- NV_conditional_render/clear
(cherry picked from commit 76056510bc)

Conflicts:

	src/gallium/drivers/r300/r300_blit.c
2011-06-10 19:45:45 +02:00
Marek Olšák
bbebbdd3e7 r300g: fix occlusion queries when depth test is disabled or zbuffer is missing
From now on, depth test is always enabled in hardware.

If depth test is disabled in Gallium, the hardware Z function is set to ALWAYS.

If there is no zbuffer set, the colorbuffer0 memory is set as a zbuffer
to silence the CS checker.

This fixes piglit:
- occlusion-query-discard
- NV_conditional_render/bitmap
- NV_conditional_render/drawpixels
- NV_conditional_render/vertex_array
(cherry picked from commit f76787b3ea)

Conflicts:

	src/gallium/drivers/r300/r300_state.c

Squashed with cherry-picked b1246cf13b.
2011-06-10 19:45:45 +02:00
Marek Olšák
e5408efb20 r300g: fix texturing with non-3D textures and wrap R mode set to sample border
If the wrap R (3rd) mode is set to CLAMP or CLAMP_TO_BORDER and the texture
isn't 3D, r300 always samples the border color regardless of texture
coordinates.

I HATE THIS HARDWARE.

NOTE: This is a candidate for the 7.10 branch.
(cherry picked from commit da8b4c0798)

Conflicts:

	src/gallium/drivers/r300/r300_state_derived.c
2011-06-09 04:23:14 +02:00
Marek Olšák
8f8d7d0803 r300g: fix draw_vbo splitting on r3xx-r4xx
NOTE: This is a candidate for the 7.10 branch.
(cherry picked from commit 578d4539ba)

Conflicts:

	src/gallium/drivers/r300/r300_render.c
2011-06-09 01:38:24 +02:00
Jeremy Huddleston
addc396d18 darwin: Fix VG_LIB_GLOB to also match the unversioned symlink
Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
(cherry picked from commit 6ea70600b9)
2011-06-07 13:28:19 -04:00
Jeremy Huddleston
8ea26afd8b darwin: Don't link against libGL when building libOSMesa
Everything should be resolved through glapi.

Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
(cherry picked from commit cebdffaa2a)
2011-06-07 13:28:14 -04:00
Jeremy Huddleston
ca9ab0a6a1 darwin: Set VG_LIB_{NAME,GLOB} to fix make install
Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
(cherry picked from commit 22c320aa2c)
2011-06-06 19:57:00 -04:00
Jeremy Huddleston
1a79cde8fa apple: Package applegl source into MesaLib tarball
Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
(cherry picked from commit e5d241ddb2)
2011-06-06 12:48:54 -04:00
Jeremy Huddleston
4d934efa19 darwin: Define GALLIUM_DRIVERS_DIRS in darwin config
Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
(cherry picked from commit d563009cd1)
2011-06-06 12:00:16 -04:00
Jeremy Huddleston
aba30d8fbe apple: Fix build failures in applegl_glx.c
See https://bugs.freedesktop.org/show_bug.cgi?id=29162

Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>

This commit squashes three cherry-picks:
(cherry picked from commit 5d35343d12)
(cherry picked from commit 7c5f37c032)
(cherry picked from commit 2ee5272e16)
2011-06-06 12:00:16 -04:00
Jeremy Huddleston
4e18ad9d71 apple: Build darwin using applegl rather than indirect
This reverts portions of 6849916170 that caused
the darwin config to fail to build due to missing implementations in that
commit.

See https://bugs.freedesktop.org/show_bug.cgi?id=29162

Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
(cherry picked from commit 1885cf27c9)
2011-06-06 12:00:16 -04:00
Jeremy Huddleston
12537b0baf glx: Dead code removal
Remove a redundant ifndef GLX_USE_APPLEGL

Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
(cherry picked from commit 3843bbcb4c)
2011-06-06 12:00:16 -04:00
Jeremy Huddleston
891ce8aaa8 apple: ifdef out come glapi-foo on darwin
Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
(cherry picked from commit 8593bb32ea)
2011-06-06 12:00:15 -04:00
Jeremy Huddleston
0f11d05e81 apple: Change from XExtDisplayInfo to struct glx_display
Fixes regression introduced by: ab434f6b76 and
                                c356f5867f

Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
(cherry picked from commit 7cdf969527)
2011-06-06 11:51:46 -04:00
Jeremy Huddleston
1605525111 apple: Rename GLXcontext
Fixes regression introduced by: c356f5867f

Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
(cherry picked from commit 279e471750)
2011-06-06 11:51:37 -04:00
Jeremy Huddleston
d92931467d apple: Rename _gl_context_modes_find_visual to glx_config_find_visual
Fixes regression introduced by: 6ddf66e923

Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
(cherry picked from commit b7f0ed8444)
2011-06-06 11:51:28 -04:00
Jeremy Huddleston
ee004cc681 apple: Re-add driContext and do_destroy
Fixes regression introduced by: c491e585e4

Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
(cherry picked from commit 488d6c739f)
2011-06-06 11:51:22 -04:00