| Commit message (Collapse) | Author | Age | Files | Lines |
|\ |
|
| | |
|
| | |
|
| | |
|
| |
| |
| |
| |
| |
| |
| |
| | |
When we concatenate shaders to do our form of poor-man linking, if there's
multiple #version directives, preprocessing fails. This change disables
the extra #version directives by changing the first two chars to //.
This should help with some Wine issues such as bug 23946.
|
| | |
|
| |
| |
| |
| |
| |
| |
| |
| | |
Unless we're cross compiling, the HOST_CFLAGS should be the same as the
normal CFLAGS. This allows the x86 and x86_64 asm to be built correctly
with a native compiler using -m32/-m64.
Signed-off-by: Dan Nicholson <[email protected]>
|
| |
| |
| |
| | |
Signed-off-by: Brian Paul <[email protected]>
|
| |
| |
| |
| |
| |
| |
| | |
Commit d33c315d9e32584dea12cea683795b498a9f5eca removed a few too many
typedefs. We need the typedefs in glext.h which are protected by #ifdef
GL_VERSION_1_2 but we can exclude the ones protected by
GL_VERSION_1_2_DEPRECATED.
|
| |
| |
| |
| | |
Mac OS also has POSIX threads.
|
| | |
|
| | |
|
| |
| |
| |
| |
| | |
dma_bo varaible is only used for iterating so allocating memory for it only
causes memory leaks.
|
|\| |
|
| | |
|
| | |
|
| |
| |
| |
| |
| |
| |
| | |
This fixes a bug seen when doing a glDrawPixels(GL_STENCIL_INDEX) right
after a glClear(). The check-for-flush test was failing because we
didn't set the dirty_render_cache flag in softpipe_clear(). So we saw
stale data when we mapped the stencil buffer.
|
| | |
|
| |
| |
| |
| | |
It doesn't work reliably even when all the prerequisite checks are made.
|
| |
| |
| |
| |
| |
| |
| |
| |
| | |
One of the conflicst from this merge was missed:
commit 0c309bb494b6ee1c403442d1207743f749f95b6e
Merge: c6c44bf d27d659
Author: Brian Paul <[email protected]>
Date: Wed Sep 9 08:33:39 2009 -0600
|
| |
| |
| |
| | |
This fixes some issues when "return"ing from nested loops/conditionals.
|
| |
| |
| |
| | |
Plus, check for pixel transfer stencil index/offset.
|
|\|
| |
| |
| |
| | |
Conflicts:
src/mesa/drivers/dri/intel/intel_context.c
|
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Signed-off-by: Zhenyu Wang <[email protected]>
Signed-off-by: Ian Romanick <[email protected]>
Hopefully this will be one of the last cherry-picks.
(cherry picked from commit ca246dd186f9590f6d67038832faceb522138c20)
|
| |
| |
| |
| |
| |
| |
| |
| | |
This was a regression in 0f328c90dbc893e15005f2ab441d309c1c176245.
Bug #23688
Bug #23254
(cherry picked from commit 5604b27b9326ac542069a49ed9650c4b0d3e939a)
|
| |
| |
| |
| |
| | |
For some env modes (like modulate or replace) we don't have to clamp
because we know the results will be in [0,1].
|
| |
| |
| |
| | |
Fixes typo from commit c6c44bf48124dd5b4661014a8d58482c5a54557f.
|
| |
| |
| |
| |
| |
| | |
Variadic functions can't be inlined which makes debugging to have quite large
function overead. Only aleternative method is to use variadic macros which are
inlined so compiler can optimize debugging to minimize overhead.
|
| | |
|
| | |
|
|\|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Conflicts:
Makefile
configs/default
progs/glsl/Makefile
src/gallium/auxiliary/util/u_simple_shaders.c
src/gallium/state_trackers/glx/xlib/xm_api.c
src/mesa/drivers/dri/i965/brw_draw_upload.c
src/mesa/drivers/dri/i965/brw_vs_emit.c
src/mesa/drivers/dri/intel/intel_context.h
src/mesa/drivers/dri/intel/intel_pixel.c
src/mesa/drivers/dri/intel/intel_pixel_read.c
src/mesa/main/texenvprogram.c
src/mesa/main/version.h
|
| |
| |
| |
| | |
Mac OS does not have libdrm.
|
| |
| |
| |
| | |
I'm not 100% sure there'll be a 7.5.2 release, but just in case.
|
| | |
|
| |
| |
| |
| | |
See bug 20413.
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
The rule added in 488b3c4d1bc3d830477180759a42dbaf8f5801b0 does not use the
right INCDIR, breaking the build when GL isn't installed in the default include
paths.
7.5 branch only fix, already fixed in master by rewriting the Makefile
(ceb9459ed5e63207defa5d715958c2757933272f)
Signed-off-by: Peter Hutterer <[email protected]>
|
| |
| |
| |
| | |
(cherry picked from commit c80ce5ac90b1e0ac7a72cd41c314aa2000bfecf5)
|
| |
| |
| |
| | |
(cherry picked from commit df70d3049a396af3601d2a1747770635a74120bb)
|
| |
| |
| |
| |
| |
| | |
We could have mapped the wrong set of draw buffers. Noticed while looking
into a DRI2 glean ReadPixels issue.
(cherry picked from commit afc981ee46791838f3cb83e11eb33938aa3efc83)
|
| |
| |
| |
| | |
(cherry picked from commit dcfe0d66bfff9a55741aee298b7ffb051a48f0d3)
|
| |
| |
| |
| | |
(cherry picked from commit 99174e7630676307f618c252755a20ba61ad9158)
|
| |
| |
| |
| |
| | |
(cherry picked from commit a70e1315846cd5e8d6f2b622821ff8262fe7179d)
(cherry picked from commit 29e51c3872531366570d032147abad50f8a3c1af)
|
| |
| |
| |
| |
| |
| | |
This may or may not be required pre-965, but it doesn't seem unlikely, and
I'd rather be safe.
(cherry picked from commit b053474378633249be0e9f24010650ffb816229a)
|
| |
| |
| |
| |
| |
| |
| |
| |
| | |
For some IZ setups, we'd forget to account for the source depth register
being present, so we'd both read the wrong reg, and write output depth to
the wrong reg.
Bug #22603.
(cherry picked from commit f44916414ecd2b888c8a680d56b7467ccdff6886)
|
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Fixes piglit glsl-vs-if-bool and progs/glsl/twoside, and will likely be
useful for the looping code.
Bug #18992
(cherry picked from commit 78c022acd0b37bf8b32f04313d76255255e769c1)
(cherry picked from commit 63d7a2f53fb38e170f4e55f2b599e918edf2c512)
|
| |
| |
| |
| | |
(cherry picked from commit fd7d764514c540987549c3ea88a2d669b0f0ea58)
|
| |
| |
| |
| |
| |
| | |
Previously, we'd be branching based on whatever condition code happened to be
laying around.
(cherry picked from commit 7007f8b352763af89805f287153cb7972bff0523)
|
| | |
|
| |
| |
| |
| |
| | |
Bug #20821
(cherry picked from commit 191e028de20b2f954621b652aa77b06d0e93652a)
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
This avoids sending a bad buffer address to the GPU due to programmer error,
and is permitted by the ARB_vbo spec. Note that we still have the opportunity
to dereference past the end of the GPU, because we aren't clipping to a
correct _MaxElement, but that appears to be harder than it should be. This
gets us the 90% solution.
Bug #19911.
(cherry picked from commit d7430d942f6c7950a92367aeb13b80cf76ccad78)
|