Mesa (8.0): 69 new commits
Ian Romanick
idr at kemper.freedesktop.org
Sat Jan 28 02:44:25 UTC 2012
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=0dddf4c575c7d8398727b80b6475b01e9f2e0b22
Author: Ian Romanick <ian.d.romanick at intel.com>
Date: Fri Jan 27 17:45:49 2012 -0800
mesa: Bump version number to 8.0-rc2
Signed-off-by: Ian Romanick <ian.d.romanick at intel.com>
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=4aa158d09aab294845d33027dc1ef42056dec90a
Author: Kenneth Graunke <kenneth at whitecape.org>
Date: Thu Jan 26 05:38:28 2012 -0800
i965/vs: Use the sampler for VS pull constant loading on Ivybridge.
Substantially increases performance in GLBenchmark PRO:
- 320x240 => 3.28x
- 1920x1080 => 1.47x
- 2560x1440 => 1.27x
The LD message ignores the sampler unit index and SAMPLER_STATE pointer,
instead relying on hard-wired default state. Thus, there's no need to
worry about running out of sampler units or providing SAMPLER_STATE;
this small patch should be all that's required.
NOTE: This is a candidate for release branches.
(It requires the preceding commit to compile.)
Signed-off-by: Kenneth Graunke <kenneth at whitecape.org>
Reviewed-by: Eric Anholt <eric at anholt.net>
(cherry picked from commit 259b65e2e7938de4aab323033cfe2b33369ddb07)
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=38b76cf8319168c3628cc18c6231e9a081a2481b
Author: Kenneth Graunke <kenneth at whitecape.org>
Date: Thu Jan 26 05:33:19 2012 -0800
i965: Expose brw_set_sampler_message for use outside brw_eu_emit.c.
brw_SAMPLE is full of complex workarounds for original Broadwater
hardware, and I'd rather avoid all that for my next Ivybridge patch.
Signed-off-by: Kenneth Graunke <kenneth at whitecape.org>
Reviewed-by: Eric Anholt <eric at anholt.net>
(cherry picked from commit 5f4575d42fdaaf671d4b3cdcf2c733ad9d35d339)
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=73ff415b596ea0449bd79b2a076987678fcefebd
Author: Paul Berry <stereotype441 at gmail.com>
Date: Mon Jan 9 15:36:27 2012 -0800
i965: Set pitch of pull constant buffers to 16.
We always access pull constant buffers using the message types "OWord
Block Read" or "OWord Dual Block Read". According to the Sandy Bridge
PRM, Vol 4 Part 1, pages 214 and 218, when using these messages:
"the surface pitch is ignored, the surface is treated as a
1-dimensional surface. An element size (pitch) of 16 bytes is
used to determine the size of the buffer for out-of-bounds
checking if using the surface state model."
Previously we were setting the pitch for pull constant buffers to the
size of the whole constant buffer--this made no sense and would have
led to incorrect behavior if it were not for the fact that the pitch
is ignored.
For clarity, this patch sets the pitch for pull constant buffers to 16
bytes, consistent with the hardware's behavior.
v2: Clarify the meaning of the ignored values by writing them as (16 - 1).
Reviewed-by: Eric Anholt <eric at anholt.net>
Reviewed-by: Kenneth Graunke <kenneth at whitecape.org>
(cherry picked from commit fcd5af4a916b4ba7860ba27eb47404934bde0d08)
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=58e0c4f87272bfae09f522c8a1cfce112a04a3b2
Author: Ian Romanick <ian.d.romanick at intel.com>
Date: Fri Jan 20 17:23:02 2012 -0800
mesa: Don't resurrect deleted ARB VAOs in glPopClientAttrib
When ARB VAOs are used, glPopClientAttrib does not resurrect a deleted
VAO or VBO. This difference between the two spec is, unfortunately,
not very well spelled out in the specs.
Fixes oglc vao(advanced.pushPop.deleteVAO) and
vao(advanced.pushPop.deleteVBO) tests.
NOTE: This is a candidate for release branches.
Signed-off-by: Ian Romanick <ian.d.romanick at intel.com>
Reviewed-by: Brian Paul <brianp at vmware.com>
(cherry picked from commit 34c353ce463960afdf64fa2be1f155b8b7f6c70c)
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=eea63b7621740ad020b9a2448f9c2f809f4827f3
Author: Ian Romanick <ian.d.romanick at intel.com>
Date: Mon Jan 23 14:22:38 2012 -0800
mesa: Rename gl_array_object::VBOonly to ::ARBsemantics
There are more differences between Apple and ARB than just requiring
that all arrays be stored in VBOs. Additional uses will be added in
following commits.
Also, set the flag at Bind time instead of Gen time. The ARB_vao spec
specifies that behavior.
NOTE: This is a candidate for release branches.
Signed-off-by: Ian Romanick <ian.d.romanick at intel.com>
Reviewed-by: Brian Paul <brianp at vmware.com>
(cherry picked from commit 09639901530da7df7347428512c2bee86af1ef8e)
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=85a52bf7b5f5f0317d15a51f94f294fc5e72d936
Author: Ian Romanick <ian.d.romanick at intel.com>
Date: Thu Jan 19 17:29:37 2012 -0800
swrast: Use fixed-function processing instead _TexEnvProgram for DrawPixels
This is a hack to work around drivers such as i965 that:
- Set _MaintainTexEnvProgram to generate GLSL IR for
fixed-function fragment processing.
- Don't call _mesa_ir_link_shader to generate Mesa IR from the
GLSL IR.
- May use swrast to handle glDrawPixels.
Since _mesa_ir_link_shader is never called, there is no Mesa IR to
execute. Instead do regular fixed-function processing.
Even on platforms that don't need this, the software fixed-function
code is much faster than the software shader code.
NOTE: This is a candidate for the 8.0 branch.
Signed-off-by: Ian Romanick <ian.d.romanick at intel.com>
Reviewed-by: Brian Paul <brianp at vmware.com>
Reviewed-by: Eric Anholt <eric at anholt.net>
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=44749
(cherry picked from commit 9be3be3c6654da18466626c2d45ff4d06b5fb953)
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=05b7f13af191e6fdf640e97017b073684550159b
Author: Ian Romanick <ian.d.romanick at intel.com>
Date: Thu Jan 19 17:23:51 2012 -0800
mesa: Make sure _TexEnvProgram points at the current ff fragment program
At least one place, the _mesa_need_secondary_color function in
state.h, uses this to make decisions. The next patch in this series
will add another dependency. Ideally, this field would go away and be
replace by a flag or something.
NOTE: This is a candidate for the 8.0 branch.
Signed-off-by: Ian Romanick <ian.d.romanick at intel.com>
Reviewed-by: Brian Paul <brianp at vmware.com>
Reviewed-by: Eric Anholt <eric at anholt.net>
(cherry picked from commit 34db7a8c1e775aaefad7952133e087f1c1a569f6)
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=93d5799e8bf8bb67d985d59cccf1063dedd3cedd
Author: Brian Paul <brianp at vmware.com>
Date: Tue Jan 24 13:32:13 2012 -0700
swrast: fix uninitialized variable warning
(cherry picked from commit ba151a333be7a23266b23ee6f65669bb19221546)
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=4f8b00d8effc9b1494e644cb3e15d8519083a8cf
Author: Brian Paul <brianp at vmware.com>
Date: Tue Jan 24 13:29:05 2012 -0700
swrast: make rowStride variable signed in put_z32_values()
As with commit aed5c8299fe47b8e1728f8140d069bc89d3fa947
(cherry picked from commit cf386f0a2ba3efcfd6ddbfcbebaf98a9bfa7a29f)
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=b5a5a1c6153d9a6ef16f60b391fe0181305d9c96
Author: Brian Paul <brianp at vmware.com>
Date: Wed Jan 18 17:47:32 2012 -0700
intel: use swrast code to map/unmap renderbuffers for swrast rendering
(cherry picked from commit 89bb19adb08caaefc01e613e9bbfbdd1f366ddab)
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=4d72e190c0c6b6d5988ca523018e31075e2fd832
Author: Brian Paul <brianp at vmware.com>
Date: Wed Jan 18 17:39:33 2012 -0700
mesa: update comments, fix whitespace in dd.h
(cherry picked from commit 4baf90353dee771e553c552674616b93aedeaecf)
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=e442906c87ff7e42f1c2a2ea3d408929bd2552e1
Author: Brian Paul <brianp at vmware.com>
Date: Wed Jan 18 17:39:33 2012 -0700
swrast: remove unused StoreTexel code
No longer needed since we do all rendering to texture with the buffer
mapping and pixel packing functions.
(cherry picked from commit 9403cc3aba0769dc6925cea3ec20aa95d491f516)
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=12370e050a62769052c967462fb30c6d4c6a95fb
Author: Brian Paul <brianp at vmware.com>
Date: Wed Jan 18 17:39:33 2012 -0700
swrast: use Map/UnmapTextureImage() in framebuffer map/unmap code
When we're actually rendering into a texture, map the texture image
instead of the corresponding renderbuffer. Before, we just copied
a pointer from the texture image to the renderbuffer. This change
will make the code usable by hardware drivers.
(cherry picked from commit 1caf698191fb871850311353862eb7fc927f9f9c)
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=5163fed9194e4dfcd9a1935cffcdaff93f4ea846
Author: Brian Paul <brianp at vmware.com>
Date: Mon Jan 16 13:06:03 2012 -0700
mesa: remove ctx->Driver.Map/UnmapTexture() hooks
No longer used anywhere.
(cherry picked from commit 56d83ac4bf0267982554f25c6fdb3c1dd6e14a9c)
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=acfbf24335118ef70f09d6107ce9af3320834731
Author: Brian Paul <brianp at vmware.com>
Date: Mon Jan 16 13:05:59 2012 -0700
nouveau: stop calling ctx->Driver.Map/UnmapTexture()
And remove unused nouveau_texture_map/unmap()
(cherry picked from commit 8b8a54afd9b748b7250993393864544ad6961edb)
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=765892865f77fb11815bc1f8a4536f0b2436c20d
Author: Brian Paul <brianp at vmware.com>
Date: Mon Jan 16 13:05:55 2012 -0700
tnl: remove ctx->Driver.Map/UnmapTexture() calls
ctx->Driver.MapTexture() always points to _swrast_map_texture().
We're already reaching into swrast from t_vb_program.c anyway.
This will let us remove the ctx->Driver.Map/UnmapTexture() functions.
(cherry picked from commit 4bbab2275f792553f8ed6bcebfe6acc4cb4179c2)
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=9daa974d4d792b1cea84ef7676bec556e248c4b9
Author: Brian Paul <brianp at vmware.com>
Date: Mon Jan 16 13:05:49 2012 -0700
swrast: move some renderbuffer functions to s_renderbuffer.c
(cherry picked from commit bde356a1580f52cae0aaca020a33a6437083a450)
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=05adf4d6e44419eb650dc767929df9bf42d923a5
Author: Brian Paul <brianp at vmware.com>
Date: Mon Jan 16 13:05:44 2012 -0700
intel: remove intel_span_supports_format()
It always returned True.
(cherry picked from commit 1839a7fc9faae81d32ffc0cdc908b933f4524e28)
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=eca54b1eb442abec1d42a81171dc7da15f691627
Author: Brian Paul <brianp at vmware.com>
Date: Mon Jan 16 13:05:41 2012 -0700
swrast: remove a few extra _mesa_get_format_bytes() calls
(cherry picked from commit 6c1e27ba219e41ae2641cca0d3c67462bdba8631)
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=8e5cf4cb45b2a2cc989530d17933228ec86cfe1a
Author: Brian Paul <brianp at vmware.com>
Date: Mon Jan 16 13:05:36 2012 -0700
mesa: update comments for gl_renderbuffer
(cherry picked from commit 1da7d6c919e9a6d756b208caa6685bfa1146b543)
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=1fd179b9840e47f0e904183398116f451220b8cb
Author: Brian Paul <brianp at vmware.com>
Date: Mon Jan 16 13:05:07 2012 -0700
mesa/swrast/drivers: remove obsolete gl_renderbuffer fields
This removes the last of the legacy fields from gl_renderbuffer.
(cherry picked from commit 1888dd52a32e114e7b3796db5a6b44921a2e04d4)
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=843194d89fe3686ff3de85eb5aff3893917864b7
Author: Brian Paul <brianp at vmware.com>
Date: Mon Jan 16 13:03:28 2012 -0700
dri/swrast: use swrast_renderbuffer type
(cherry picked from commit becbb643135ddccac5054bf138ca0cc7cc3fff15)
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=7c95a4ec2266e1c2e35a39df30b9c7066fd05c70
Author: Brian Paul <brianp at vmware.com>
Date: Mon Jan 16 13:02:19 2012 -0700
swrast: use swrast_renderbuffer instead of gl_renderbuffer
(cherry picked from commit 0c1862851f27c428a18ba5509636efcc2f0084f8)
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=9567178ca2be19ff2b03dae382439073e729daea
Author: Brian Paul <brianp at vmware.com>
Date: Mon Jan 16 13:01:35 2012 -0700
osmesa: use swrast_renderbuffer
(cherry picked from commit 797c18be1f907337ebd85b18ce43dfa0b056f492)
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=83602e83424926677af462c87d0b6c273ad82492
Author: Brian Paul <brianp at vmware.com>
Date: Mon Jan 16 12:52:21 2012 -0700
radeon: derive radeon_renderbuffer from swrast_renderbuffer
(cherry picked from commit c080202db5363a18a759a9a7c82b40ac558c8abe)
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=b31bfae0db24f2c7c5592fc423bdb221219d0faf
Author: Brian Paul <brianp at vmware.com>
Date: Mon Jan 16 12:40:01 2012 -0700
intel: derive intel_renderbuffer from swrast_renderbuffer
Drivers that rely on swrast need to do this, as with swrast_texture_image.
(cherry picked from commit 9f8ed9d66298e2dc5dff508e3ea723469fe06d93)
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=49ab5ad14299ca9e68437586ce9298edff74e31c
Author: Brian Paul <brianp at vmware.com>
Date: Mon Jan 16 12:35:49 2012 -0700
xlib: derive xmesa_renderbuffer from swrast_renderbuffer
(cherry picked from commit d16e71eeb47d1e67930f6e86a80dc926468224d9)
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=5916b152479be63d77ae5f4da9b30bf3261d828f
Author: Brian Paul <brianp at vmware.com>
Date: Mon Jan 16 12:35:45 2012 -0700
swrast: allocate swrast_renderbuffers instead of gl_renderbuffers
(cherry picked from commit f2479530b8be3866c234ac759a7fa84e634dd1aa)
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=a36cc604cfd44883c45b0936d62eb81a9c222552
Author: Brian Paul <brianp at vmware.com>
Date: Mon Jan 16 12:29:15 2012 -0700
swrast: new swrast_renderbuffer type
This will let us move the swrast-specific fields out of gl_renderbuffer.
(cherry picked from commit 34988272d9c7a889a26bb8bdcb841d44797a5dd6)
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=73ed8cec4a959124fd4081c99e87594a1e480e12
Author: Brian Paul <brianp at vmware.com>
Date: Mon Jan 16 12:29:11 2012 -0700
intel: use intel_rb_format() to get renderbuffer format
This will make future changes cleaner and less invasive.
(cherry picked from commit 924de7dc96f4607cb3d833637b5f69f4b9e2a6d0)
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=c6e56a69d83f26ffe443abb6e7fe6ce4a2f90041
Author: Brian Paul <brianp at vmware.com>
Date: Mon Jan 16 12:29:04 2012 -0700
dri/swrast: rename swrast_renderbuffer to dri_swrast_renderbuffer
To prevent name collision with future swrast_renderbuffer in the swrast
module.
(cherry picked from commit 1048d55d5fa60d17dd99ac7394ff0572500625f9)
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=d980b8350f75ab2cec7363815951e83bb2ef7dfa
Author: Brian Paul <brianp at vmware.com>
Date: Mon Jan 16 12:28:59 2012 -0700
swrast: use stencil packing function in s_stencil.c
(cherry picked from commit c45771905f237d9285465dfce955440582ee51e5)
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=143999bdd830178957c5b3498f90a1c3495cc260
Author: Brian Paul <brianp at vmware.com>
Date: Mon Jan 16 12:28:56 2012 -0700
swrast: use color packing functions in s_span.c
(cherry picked from commit 881ef2a9db22cff4c7d07b873d23b0c324da555a)
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=ae3bd76e31d85f9d5c628c2d609967378293aad3
Author: Brian Paul <brianp at vmware.com>
Date: Mon Jan 16 12:28:51 2012 -0700
swrast: remove s_spantemp.h
(cherry picked from commit 8696a5210289166ce39d765d771258258400e876)
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=86fc256131b44206604e225bee71385e7b5f5f49
Author: Brian Paul <brianp at vmware.com>
Date: Mon Jan 16 12:28:47 2012 -0700
xlib: remove xm_span.c and related code
(cherry picked from commit b0f0d7a8118401b209c674804255b5fd9e8c94c0)
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=5cb5aa4a846861fa46369ac4b144160d8519b708
Author: Brian Paul <brianp at vmware.com>
Date: Mon Jan 16 12:28:42 2012 -0700
mesa: remove gl_renderbuffer::Wrapped
There's no such thing as renderbuffer wrappers anymore.
(cherry picked from commit 59a5b5a193d5d9c5776aa586b34657b6e315479d)
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=f0ad188c9fac676cf0f2a752707ce1edd2e7f708
Author: Brian Paul <brianp at vmware.com>
Date: Mon Jan 16 12:27:50 2012 -0700
swrast: rewrite, simplify the the render-to-texture code
(cherry picked from commit ab331140c68d1c157e69ea8e53b44729355fa43c)
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=8786555199e0916be516492e512afcdb01dc7eb5
Author: Brian Paul <brianp at vmware.com>
Date: Mon Jan 16 12:10:46 2012 -0700
mesa: rename gl_renderbuffer::Data to Buffer
To better indicate that this pointer to the malloc'd memory.
(cherry picked from commit 7a36345f70a0b8ac2d480bb52eb2c74c2be5a978)
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=f29212ecba70cc9d7f764084f2a56bde67c548bc
Author: Brian Paul <brianp at vmware.com>
Date: Mon Jan 16 12:15:40 2012 -0700
mesa: move freeing of software renderbuffers into swrast
(cherry picked from commit f6a3979a0444a14c198c10501e9ff13f24625443)
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=8e5e73542459dabd241c35d0aa3ea7c0e30bf2ed
Author: Brian Paul <brianp at vmware.com>
Date: Mon Jan 16 12:03:09 2012 -0700
mesa: remove gl_renderbuffer::DataType
(cherry picked from commit f9874feef4d8952df5054bd8e8f4e0deda4ef44f)
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=f5367c45031cac167f3ef8ee273880318156e787
Author: Brian Paul <brianp at vmware.com>
Date: Mon Jan 16 11:48:18 2012 -0700
mesa: remove gl_renderbuffer:RowStride field
(cherry picked from commit 1e1b5cb01a10e39d01923e3c7e989c44210950cd)
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=d60bcbe31da5869f018ca73f43f93cc391e79f9a
Author: Brian Paul <brianp at vmware.com>
Date: Mon Jan 16 11:32:12 2012 -0700
mesa: finally, remove the GetRow/PutRow/etc functions
(cherry picked from commit 82846fea4d042466ccfd5b3c86d98e856086cc05)
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=64deeddce8eafa3d220c2db12a33848c2e12ed19
Author: Brian Paul <brianp at vmware.com>
Date: Mon Jan 16 11:30:03 2012 -0700
dri: remove all the obsolete spantmp files
(cherry picked from commit 304f7a132741a528ca6e861a918ef59991874e5f)
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=514fcec7daaf807bf228102e14618ea2494f450a
Author: Brian Paul <brianp at vmware.com>
Date: Mon Jan 16 11:29:58 2012 -0700
radeon: remove obsolete GetRow/PutRow code
(cherry picked from commit a4c6dedb27897ae1340983b5d12927e0a9fb2212)
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=9b5e40283794c033522bbe92e1236ca0b5006c91
Author: Brian Paul <brianp at vmware.com>
Date: Mon Jan 16 11:29:53 2012 -0700
nouveau: remove obsolete GetRow/PutRow code
(cherry picked from commit f892debdc21d12c40d2b69b4e9efdf527672d3ec)
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=57df49908ec4d5724d824a4b5482b7b7db02c06a
Author: Brian Paul <brianp at vmware.com>
Date: Mon Jan 16 11:29:35 2012 -0700
intel: remove most of the span Get/PutRow code
(cherry picked from commit 41869c49421141807ab71cabca4c8a07611f6a64)
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=38e4496ac3154642e0c69a5e0a7ff400e3b7186c
Author: Brian Paul <brianp at vmware.com>
Date: Mon Jan 16 11:28:15 2012 -0700
dri/swrast: remove obsolete GetRow/PutRow code
This is a squash of:
dri/swrast: remove obsolete GetRow/PutRow code
(cherry picked from commit cb5fa9ea624574909bf57f9e1ad190a440d59dc2)
and
dri/swrast: remove obsolete swrast_span.c file from source list
(cherry picked from commit a9bf149e7f699d05bcf31dff54c4b4cf78018dd0)
Conflicts:
src/mesa/drivers/dri/swrast/Makefile.sources
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=39d978a60c193b6be20bc42714d883d725b8fa4d
Author: Brian Paul <brianp at vmware.com>
Date: Mon Jan 16 11:28:02 2012 -0700
osmesa: remove obsolete GetRow/PutRow code
(cherry picked from commit 2873555a76a7358db053c3a7b121b489f8df9bb1)
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=e4b42d618c0fe501ac3438063e1eb8d21cd59c35
Author: Brian Paul <brianp at vmware.com>
Date: Mon Jan 16 11:24:18 2012 -0700
xlib: remove obsolete GetRow/PutRow code
(cherry picked from commit 2e80c7e5bf822e3b9efd145d33badcf4f14504ff)
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=d85b4bae0ea615c54a342e10351c82901b3eb7db
Author: Brian Paul <brianp at vmware.com>
Date: Mon Jan 16 11:24:09 2012 -0700
mesa: remove obsolete PutRow, etc assignments
(cherry picked from commit 0d2f0c8bb86b8dfcb6f0be7bf027fe725007bc5f)
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=3dd893749295a785688150452eddf829c7b605c3
Author: Brian Paul <brianp at vmware.com>
Date: Thu Jan 12 18:33:09 2012 -0700
swrast: remove Get/PutRow()-related code
(cherry picked from commit d65bbfa947b9e2c5353bda857470a01d5398b3fa)
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=1f0cc3faf2b6b615f55f524d0a16a0da98b9549c
Author: Brian Paul <brianp at vmware.com>
Date: Mon Jan 16 11:38:46 2012 -0700
st/mesa: remove gl_renderbuffer::GetPointer stuff
(cherry picked from commit a4a566a610778e6ab93424a38e372c3dcb7d92d3)
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=f00ba2191567baed42018e2d62688233b46b8dba
Author: Brian Paul <brianp at vmware.com>
Date: Mon Jan 16 10:55:39 2012 -0700
swrast: stop using Put/GetRow/Values() in swrast code
All color buffer rendering is now done by accessing mapped renderbuffer
memory. We're now able to get rid of all the GetRow/PutRow stuff.
(cherry picked from commit 0ff817f200ef4cb4a5ab0d90eccfc83d0671fb65)
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=c8562a6ed39287582c4a484e19c4efd62dd5df2f
Author: Brian Paul <brianp at vmware.com>
Date: Mon Jan 16 10:55:32 2012 -0700
swrast: use gl_renderbuffer::StrideInBytes in depth/stencil code
(cherry picked from commit b766d4bb43b2c8271413c1efafe3590fa75efc3c)
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=48173180b55241d0536999a90a3c1a000ce35500
Author: Brian Paul <brianp at vmware.com>
Date: Mon Jan 16 10:55:25 2012 -0700
mesa: use gl_renderbuffer::Map for all depth/stencil accesses
Instead of using the obsolete gl_renderbuffer::Data field.
Color buffer are still accessed through GetRow/PutRow().
(cherry picked from commit 7d1ddec92168e9b6ead0da80b18364a75f9a85e6)
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=349d5a8a383f70464baf7a838c56accf0189527f
Author: Brian Paul <brianp at vmware.com>
Date: Mon Jan 16 10:55:20 2012 -0700
intel: make intel_renderbuffer_map/unmap() static
(cherry picked from commit 14da67d9b9b9e30740ef1687c3952a0b5e8b0a54)
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=fee5f10241e8efd3f875b8721aa9515a33dce299
Author: Brian Paul <brianp at vmware.com>
Date: Mon Jan 16 10:55:15 2012 -0700
mesa: add new gl_renderbuffer fields
These are temporary, actually, but they'll make follow-on work easier to
implement in a step-by-step manner. Eventually the Map and RowStrideBytes
fields will go into a new swrast_renderbuffer type, but adding that type
now would involve touching a _lot_ of code that'll eventually be removed.
The fields marked as obsolete will go away completely at some point.
(cherry picked from commit 827c1d66f671e50d9d96277b1fd3a59309626f66)
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=83eb5e43722cf0a6b3366ddf6a7ff3f8a44d4c23
Author: Brian Paul <brianp at vmware.com>
Date: Mon Jan 16 10:55:10 2012 -0700
swrast: flush pending rendering before unmapping buffers
(cherry picked from commit fc9f74839d50ab5480ae657524cf2ddebf55d451)
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=5f6676b0ee6f847c1473670f665fcea03ff8f224
Author: Brian Paul <brianp at vmware.com>
Date: Mon Jan 16 10:54:53 2012 -0700
swrast: new assertions in _swrast_pixel_address()
(cherry picked from commit 33257803d9083643ea9709c127933d5a2c4f1960)
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=7c6f54811c7c1843f862ab4986431527f56a6db1
Author: Brian Paul <brianp at vmware.com>
Date: Mon Jan 16 10:54:47 2012 -0700
swrast: use _swrast_pixel_address() in more places
(cherry picked from commit e34a54ff451a37a6e6eab529c44330dd6a8b218b)
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=a42dcf1614cae7a1f896eb934c99c78dfd36c1d8
Author: Brian Paul <brianp at vmware.com>
Date: Mon Jan 16 10:54:41 2012 -0700
swrast: s/Data/Map/ in swrast_texture_image
To indicate that it points to mapped texture memory.
(cherry picked from commit bd3c10c0f0c60ab3421c2da2eab814edc2296cb0)
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=573e1478eb789230efcad952b5fdbe902375d867
Author: Brian Paul <brianp at vmware.com>
Date: Mon Jan 16 10:54:36 2012 -0700
swrast: remove gl_renderbuffer::DataType check in DrawPixels()
The field will be going away so update this code.
(cherry picked from commit ecb8594c184f5daa2f5a735e42ee24e7d110aa9f)
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=490057ae81e87823cb85cbd663087b7b4d1b12c9
Author: Brian Paul <brianp at vmware.com>
Date: Mon Jan 16 10:54:31 2012 -0700
swrast: remove gl_renderbuffer::DataType assertions
This field will go away, so remove some uses of it.
(cherry picked from commit 7726be1c1b8ae321d01e781b5db4e2224e67d13d)
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=d2d1419ba076101ef55b9142d44855351dc6afc6
Author: Brian Paul <brianp at vmware.com>
Date: Mon Jan 16 10:54:23 2012 -0700
st/mesa: remove gl_renderbuffer:DataType assignments
That field is only used by swrast code so there's no reason to mess
with it in the gallium state tracker.
This also lets us remove the unused st_format_data() type function and
related code.
(cherry picked from commit ca6d86d26b1726b13baa21b73fe9d426f28370e2)
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=0941b808a62d9b8cd380830603d84008cceecec2
Author: Brian Paul <brianp at vmware.com>
Date: Mon Jan 16 10:54:19 2012 -0700
swrast: make _swrast_get_values(), _swrast_get_row() static
They were only called from in s_span.c
(cherry picked from commit ff57b0f037a45b0d5ced38234f0a8b29d32e7f9d)
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=ac6074de17aee7e3b93034897332c87271bfe9b8
Author: Brian Paul <brianp at vmware.com>
Date: Mon Jan 16 10:54:13 2012 -0700
swrast: remove dstType param from _swrast_read_rgba_span()
It was always GL_FLOAT.
(cherry picked from commit 267fb178844d3f17503dd0f921791f3ab059c4e7)
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=289a7e74b32267b6b65a02f387f6701d70aa2eaf
Author: Brian Paul <brianp at vmware.com>
Date: Mon Jan 16 10:54:01 2012 -0700
swrast: remove unused _swrast_put_row()
(cherry picked from commit 64be85540f30e904784c6a72f2ba2784d5ccb36d)
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=889f756c2864df9428289f11a9ad837147e6d963
Author: Chad Versace <chad.versace at linux.intel.com>
Date: Wed Jan 18 15:56:58 2012 -0800
swrast: Fix unsigned promotion in pointer arithmetic
When rowstride was negatie, unsigned promotion caused a segfault here:
299│ if (rb->Format == MESA_FORMAT_S8) {
300│ const GLuint rowStride = rb->RowStride;
301│ for (i = 0; i < count; i++) {
302│ if (x[i] >= 0 && y[i] >= 0 && x[i] < w && y[i] < h) {
303├> stencil[i] = *(map + y[i] * rowStride + x[i]);
304│ }
305│ }
306│ }
Fixes segfault in oglconform
separatestencil-neu(NonPolygon.BothFacesBitmapCoreAPI),
though test still fails.
Note: This is a candidate for the stable branches.
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=43327
Reviewed-by: Brian Paul <brianp at vmware.com>
Signed-off-by: Chad Versace <chad.versace at linux.intel.com>
(cherry picked from commit aed5c8299fe47b8e1728f8140d069bc89d3fa947)
More information about the mesa-commit
mailing list