| Commit message (Collapse) | Author | Age | Files | Lines |
|\
| |
| |
| |
| |
| | |
Conflicts:
src/mesa/drivers/dri/r600/r700_assembler.c
src/mesa/main/version.h
|
| |\ |
|
| | |
| | |
| | |
| | |
| | | |
makes testing other things easier - does not hang the card
TODO: enable TEX dependency tracking in vertex programs
|
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
First time around render targets are not enabled yet (done in
r700SendRenderTargetState) so blend state is not emitted for any targets.
Affects first glClear in some mesa tests.
As a quick fix reorder state emit so that target is set first
|
| | | |
|
| | |
| | |
| | |
| | | |
Silences uninitialized variable compiler warning.
|
| | |
| | |
| | |
| | | |
Also modify the Makefile to use the correct version for the tarballs.
|
| |\|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
Conflicts:
progs/demos/projtex.c
progs/xdemos/glxinfo.c
src/mesa/main/version.h
To fix the confilicts in projtex.c and glxinfo.c I just took the code from
mesa_7_6_branch. The conflicts seem to have occured from cherry-picks from
mesa_7_7_branch to mesa_7_6_branch followed by commmits just to
mesa_7_6_branch.
|
| | | |
|
| | | |
|
| | |
| | |
| | |
| | | |
(cherry picked from commit 052b127842af3372fd768eae8e29b240a696a12a)
|
| | |
| | |
| | |
| | | |
(cherry picked from commit 919898e92fa23ff71a59d86a46ff0886a6f34e4d)
|
| | |
| | |
| | |
| | | |
(cherry picked from commit 364070b1f2b08d43fb205ec198894a35bec6b2f3)
|
| | |
| | |
| | |
| | | |
(cherry picked from commit 4b0b250aae6ae7d48cd24f9d91d05ab58086c4b2)
|
| | |
| | |
| | |
| | | |
(cherry picked from commit 76d2ec3a0a047a65ffca70f53848241a3225dad3)
|
| | |
| | |
| | |
| | | |
(cherry picked from commit ea98e9820d7117f7a187f355445796b1ef5d9e0c)
|
| | |
| | |
| | |
| | |
| | |
| | | |
_mesa_TexGenf calls _mesa_TexGenfv, which uses the params argument
as an array.
(cherry picked from commit ca5a7aadb4361e7d053aea8687372cd44cbd8795)
|
| | |
| | |
| | |
| | |
| | |
| | | |
_mesa_TexGeni calls _mesa_TexGeniv, which uses the params argument
as an array.
(cherry picked from commit d55fb7c835b56951f05a058083e7eda264ba192e)
|
| | |
| | |
| | |
| | |
| | |
| | | |
_mesa_TexParameterf calls set_tex_parameterf, which uses the params
argument as an array.
(cherry picked from commit 270d36da146b899d39e08f830fe34b63833a3731)
|
| | |
| | |
| | |
| | |
| | |
| | | |
_mesa_TexParameterf calls set_tex_parameteri, which uses the params
argument as an array.
(cherry picked from commit a201dfb6bf28b89d6f511c2ec9ae0d81ef18511d)
|
| | | |
|
| | | |
|
| | | |
|
| | | |
|
| | |
| | |
| | |
| | | |
The return type of glGetUniformLocationARB is GLint, not GLuint.
|
| | | |
|
| | |
| | |
| | |
| | |
| | |
| | | |
_mesa_TexEnvf calls _mesa_TexEnvfv, which uses the param argument
as an array.
(cherry picked from commit a11d60d14caf8efc07f70af63b57b33273f8cf9b)
|
| | |
| | |
| | |
| | | |
(cherry picked from commit 11905da8836822f7dd60c84b5eefc72e46c94b50)
|
| | |
| | |
| | |
| | |
| | | |
Signed-off-by: Brian Paul <[email protected]>
(cherry picked from commit c475079ef2d901ba4506ebd53e19419cd46793ab)
|
| | | |
|
| | |
| | |
| | |
| | | |
Fixes bug 24501
|
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
The fbAttribSingle/Double arrays had wrong GLX_DOUBLEBUFFER values.
We only need to use the glXChooseFBConfig() code when glXChooseVisual()
fails (but I don't know when that would happen).
Other recent commits errantly removed some code in this area too.
|
| | | |
|
| | |
| | |
| | |
| | |
| | |
| | | |
fixes fdo bug 25354
Signed-off-by: Alex Deucher <[email protected]>
|
| | |
| | |
| | |
| | | |
(cherry picked from commit 808f0376607b0e2d31dfebc888fd8f1e737fed09)
|
| | |
| | |
| | |
| | | |
(cherry picked from commit 94bcb9f1a43f2ab3bdff09156e3ab5b1c115cbd8)
|
| | |
| | |
| | |
| | | |
(cherry picked from commit 0d89f3dc7ff3f89ba8d5d664253730485bca35e2)
|
| | |
| | |
| | |
| | | |
(cherry picked from commit f895abbd9777c4985aa40cf660c68f6d7333f0ec)
|
| | |
| | |
| | |
| | | |
(cherry picked from commit 326b66d724754ca97012501db1c7c62d7d41a457)
|
| | |
| | |
| | |
| | | |
(cherry picked from commit 5b925b7daa566d799c4f50911a7fcca114131503)
|
| | |
| | |
| | |
| | | |
(cherry picked from commit b611f639b4bffdcca376293f7ce71af9f6bdbff3)
|
| | |
| | |
| | |
| | | |
(cherry picked from commit a9c540f5dedbf593f8038fdbc95eecb60826ab26)
|
| | |
| | |
| | |
| | | |
(cherry picked from commit d3b4c99c703f70a9d0e715a97e52672f7f8fc980)
|
| | |
| | |
| | |
| | | |
(cherry picked from commit 8556fad75124e1ade9af095e112ebb6ac5cbff61)
|
| | |
| | |
| | |
| | | |
(cherry picked from commit e0857962b911ef317238498305651515d83029ae)
|
| | |
| | |
| | |
| | | |
(cherry picked from commit 4ab8dbe5935d5c946cbc9af6982461073a784d07)
|
| | |
| | |
| | |
| | | |
(cherry picked from commit a4720a1a3206dd2edecf47a21fce547a79b67610)
|
| | |
| | |
| | |
| | | |
(cherry picked from commit f080567f4c4018c4885c105a154cb0eb39e6234f)
|
| | |
| | |
| | |
| | | |
(cherry picked from commit 66a4ec14c38d407256545e0cf31c98974d621fe4)
|
| | |
| | |
| | |
| | | |
(cherry picked from commit 760cf71572a071ce43da576ebfeff4a8099150bc)
|