| Commit message (Collapse) | Author | Age | Files | Lines |
|\
| |
| |
| |
| |
| |
| |
| |
| |
| | |
There were additional non-textual conflicts.
Conflicts:
src/gallium/drivers/r300/r300_tgsi_to_rc.c
src/mesa/drivers/dri/r300/compiler/r3xx_vertprog.c
src/mesa/drivers/dri/r300/compiler/radeon_program.c
src/mesa/drivers/dri/r300/compiler/radeon_program_alu.c
|
| |\ |
|
| | |
| | |
| | |
| | | |
Signed-off-by: Nicolai Hähnle <[email protected]>
|
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
The handling is a bit inefficient, unfortunately, but I don't want to make
any intrusive changes for Mesa 7.6.
Signed-off-by: Nicolai Hähnle <[email protected]>
|
| |\| |
|
| | |\ |
|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
Since commit 2921a2555d0a76fa649b23c31e3264bbc78b2ff5 ('intel: Deassociated
drawables from private context struct in intelUnbindContext'),
intel->driDrawable may be NULL in intel_flush().
|
| | | |
| | | |
| | | |
| | | |
| | | | |
This should help detecting possible memory leaks with dma buffers and prevent
possible visual corruption if data would be overwriten too early.
|
| | | |
| | | |
| | | |
| | | | |
Signed-off-by: Nicolai Hähnle <[email protected]>
|
| | | | |
|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
Do-while makes macro safe to be used with if and for constructions.
Also remove __LINE__ macro from variable name because scope is local to macro anyway.
|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
Copy'n'paste apparently prevented the RADEON_VERTS flag from being enabled.
Signed-off-by: Nicolai Hähnle <[email protected]>
|
| | | | |
|
| | | | |
|
| | | | |
|
| | | | |
|
| | | | |
|
| | | | |
|
| | | |
| | | |
| | | |
| | | | |
This reverts commit 6c5726cd39ab12b86fae391d075fa74bc24b615c.
|
| | | |
| | | |
| | | |
| | | | |
This reverts commit 41fefe88c50376a57876b498c8619c8c9f535de6.
|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
This reverts commit 651cffd626a82d9bf539437ca4bdf8ea4b396fab.
The commit inadvertantly introduced a new gallium dependency on the meta code.
|
| | | | |
|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
meta was moved to core Mesa since
651cffd626a82d9bf539437ca4bdf8ea4b396fab.
Signed-off-by: Chia-I Wu <[email protected]>
|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
It was renamed to _mesa_meta_Clear.
Signed-off-by: Chia-I Wu <[email protected]>
|
| | | | |
|
| | | |
| | | |
| | | |
| | | | |
Align coordinates to tile boundaries.
|
| | | | |
|
| |\| |
| | | |
| | | |
| | | |
| | | | |
Conflicts:
src/mesa/drivers/dri/intel/intel_clear.c
|
| | |\| |
|
| | | |
| | | |
| | | |
| | | | |
Signed-off-by: Nicolai Hähnle <[email protected]>
|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
Previously srandom and random were used. This cause the global random
number generator state to be modified. This caused problems for
applications that called srandom before calling into GLX. By using
local state the global state is left unmodified.
This should fix bug #23774.
|
| | | |
| | | |
| | | |
| | | |
| | | | |
We need to be sure to call the _mesa_unmap_teximage_pbo() function if we
called _mesa_validate_pbo_teximage().
|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
The following example caused an incorrect GL_OUT_OF_MEMORY error to be
raised in glTexSubImage2D:
glTexImage2D(level=0, width=32, height=32, pixels=NULL);
glTexImage2D(level=0, width=64, height=64, pixels=NULL);
glTexSubImage2D(level=0, pixels!=NULL);
The second glTexImage2D() call needs to cause the first image to be
deallocated then reallocated at the new size. This was not happening
because we were testing for pixels==NULL too early.
|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
Normally, the mesa/st would create a fake front buffer out of a
client-allocated surface.
In the DRI setting, however, st/dri provides a front buffer surface which is
created and maintained by the X server. Prefer to use this surface instead,
so that front buffer rendering and reading works correctly.
Signed-off-by: Nicolai Hähnle <[email protected]>
|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
We obviously need to move the code addr register backwards because their may
be overlap.
This bug affected in particular the Compiz water plugin.
Signed-off-by: Nicolai Hähnle <[email protected]>
|
| | | | |
|
| | | | |
|
| | | | |
|
| | | | |
|
| | | | |
|
| | | | |
|
| | | | |
|
| | | | |
|
| | | | |
|
| | | | |
|
| | | | |
|
| | | | |
|
| | | | |
|
| | | | |
|
| | | | |
|