| Commit message (Collapse) | Author | Age | Files | Lines |
|\
| |
| |
| |
| |
| | |
Conflicts:
src/mesa/drivers/dri/r600/r700_assembler.c
src/mesa/main/version.h
|
| |\ |
|
| | |
| | |
| | |
| | | |
Silences uninitialized variable compiler warning.
|
| |\|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
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 76d2ec3a0a047a65ffca70f53848241a3225dad3)
|
| | | |
|
| | | |
|
| | | |
|
| | | |
|
| | |
| | |
| | |
| | | |
The return type of glGetUniformLocationARB is GLint, not GLuint.
|
| | | |
|
| | |
| | |
| | |
| | | |
(cherry picked from commit 11905da8836822f7dd60c84b5eefc72e46c94b50)
|
| | |
| | |
| | |
| | |
| | | |
Signed-off-by: Brian Paul <[email protected]>
(cherry picked from commit c475079ef2d901ba4506ebd53e19419cd46793ab)
|
| | | |
|
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
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.
|
| | |
| | |
| | |
| | | |
(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)
|
| | |
| | |
| | |
| | | |
(cherry picked from commit e3cfd78969cd4a94fc83a5d6fb2f33730cc4e70f)
|
| | |
| | |
| | |
| | | |
(cherry picked from commit 47b5f584a68ceab7c9c1d5279efbc9fe30ff2fcc)
|
| | |
| | |
| | |
| | | |
(cherry picked from commit 0e783c7d03128aade3ca50b28a56e254fef6b6ab)
|
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
tangentAtrrib is assigned the result of glGetAttribLocation.
The assertion 'assert(tangentAtrrib >= 0)' would be a no-op if
tangentAttrib is a GLuint.
(cherry picked from commit b8dcb79c53796f37234bd2b0f5e2845f817fc218)
|
| | |
| | |
| | |
| | | |
(cherry picked from commit 6b480dc21dd489d48685b2268e495218aea74293)
|
| | |
| | |
| | |
| | | |
(cherry picked from commit ee555e3d69c8820f27e71e5ebc028a768cef7d0b)
|
| | |
| | |
| | |
| | | |
(cherry picked from commit a1afe303deda320aadacdaf5b1c72631ca3f734f)
|
| | |
| | |
| | |
| | | |
(cherry picked from commit aef3218f0bb48fdb286d2008ee07e507ea8aa98e)
|
| | |
| | |
| | |
| | | |
(cherry picked from commit 9553a42f638bd98eb90e5b7fb37d6b82758b6363)
|
| | |
| | |
| | |
| | | |
(cherry picked from commit 3790c6a13b86dfe0afd4bb0bf9a4d9f4b429cfd8)
|
| | |
| | |
| | |
| | | |
(cherry picked from commit 881f55236ad85f95745e70f8363726fa3c201f80)
|
| | |
| | |
| | |
| | |
| | | |
Prevents a null pointer deference later on.
(cherry picked from commit e26135a744f740430e3dc341fa692544ba99c11e)
|
| | |
| | |
| | |
| | | |
(cherry picked from commit d36cb2396c942f05ba56c5b899792a507bb0f0fd)
|
| | |
| | |
| | |
| | | |
(cherry picked from commit d9508e8df9da4aa13bc223194c406081738bac91)
|
| | |
| | |
| | |
| | | |
(cherry picked from commit 786d539511eb3c5a4101b11b7f8e90d60123ac46)
|
| | |
| | |
| | |
| | | |
(cherry picked from commit 041cd0e110d41b543a0fe9cc484ae8373642912b)
|
| | |
| | |
| | |
| | | |
(cherry picked from commit 28b8e4bcd76cc072b062e4c8575327c05ecb9a55)
|
| | |
| | |
| | |
| | | |
(cherry picked from commit 0e790ac35327a0b53a4a595a6429135317302269)
|
| | |
| | |
| | |
| | | |
(cherry picked from commit cde66437247feb8b14b6d8f3ec3a8b4665fefa08)
|
| | |
| | |
| | |
| | |
| | | |
Signed-off-by: Brian Paul <[email protected]>
(cherry picked from commit 9c3197ef0abc3bf521358ea0c7af0fc6979c82b3)
|
| | |
| | |
| | |
| | |
| | | |
Signed-off-by: Brian Paul <[email protected]>
(cherry picked from commit a8ed066858f12290239ddc9165b7c0734ccc0247)
|
| | |
| | |
| | |
| | | |
(cherry picked from commit 50e113e375b4ecfdf5b60ccce7bbcdb1c5f2ca11)
|
| | |
| | |
| | |
| | | |
(cherry picked from commit 952bf63e2cf442504ef89b0b1d276da0d52b21d4)
|
| | |
| | |
| | |
| | |
| | | |
Forgot these on previous commit.
(cherry picked from commit 166957abebea6aa203eba7e6348e89d53cf0e13e)
|
| | |
| | |
| | |
| | |
| | | |
More portable. Same implementation on Linux.
(cherry picked from commit 699260b19535abaa3af0a5d33eb039e3d6a30ce9)
|
| | |
| | |
| | |
| | | |
(cherry picked from commit f7455ad7af09b5ef31ccc454b79422a13c59af9a)
|
| | |
| | |
| | |
| | | |
(cherry picked from commit 60b6c7458319ff01ecdd9d1650d526ac8f75e194)
|