summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* mesa: Bump version number to 8.0-rc2mesa-8.0-rc2Ian Romanick2012-01-272-2/+2
| | | | Signed-off-by: Ian Romanick <[email protected]>
* i965/vs: Use the sampler for VS pull constant loading on Ivybridge.Kenneth Graunke2012-01-271-0/+17
| | | | | | | | | | | | | | | | | | | 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 <[email protected]> Reviewed-by: Eric Anholt <[email protected]> (cherry picked from commit 259b65e2e7938de4aab323033cfe2b33369ddb07)
* i965: Expose brw_set_sampler_message for use outside brw_eu_emit.c.Kenneth Graunke2012-01-272-10/+22
| | | | | | | | | 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 <[email protected]> Reviewed-by: Eric Anholt <[email protected]> (cherry picked from commit 5f4575d42fdaaf671d4b3cdcf2c733ad9d35d339)
* i965: Set pitch of pull constant buffers to 16.Paul Berry2012-01-272-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | 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 <[email protected]> Reviewed-by: Kenneth Graunke <[email protected]> (cherry picked from commit fcd5af4a916b4ba7860ba27eb47404934bde0d08)
* mesa: Don't resurrect deleted ARB VAOs in glPopClientAttribIan Romanick2012-01-271-11/+42
| | | | | | | | | | | | | | | 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 <[email protected]> Reviewed-by: Brian Paul <[email protected]> (cherry picked from commit 34c353ce463960afdf64fa2be1f155b8b7f6c70c)
* mesa: Rename gl_array_object::VBOonly to ::ARBsemanticsIan Romanick2012-01-274-8/+29
| | | | | | | | | | | | | | | 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 <[email protected]> Reviewed-by: Brian Paul <[email protected]> (cherry picked from commit 09639901530da7df7347428512c2bee86af1ef8e)
* swrast: Use fixed-function processing instead _TexEnvProgram for DrawPixelsIan Romanick2012-01-271-2/+21
| | | | | | | | | | | | | | | | | | | | | | | | 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 <[email protected]> Reviewed-by: Brian Paul <[email protected]> Reviewed-by: Eric Anholt <[email protected]> Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=44749 (cherry picked from commit 9be3be3c6654da18466626c2d45ff4d06b5fb953)
* mesa: Make sure _TexEnvProgram points at the current ff fragment programIan Romanick2012-01-271-0/+9
| | | | | | | | | | | | | | 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 <[email protected]> Reviewed-by: Brian Paul <[email protected]> Reviewed-by: Eric Anholt <[email protected]> (cherry picked from commit 34db7a8c1e775aaefad7952133e087f1c1a569f6)
* swrast: fix uninitialized variable warningBrian Paul2012-01-271-1/+1
| | | | (cherry picked from commit ba151a333be7a23266b23ee6f65669bb19221546)
* swrast: make rowStride variable signed in put_z32_values()Brian Paul2012-01-271-1/+1
| | | | | As with commit aed5c8299fe47b8e1728f8140d069bc89d3fa947 (cherry picked from commit cf386f0a2ba3efcfd6ddbfcbebaf98a9bfa7a29f)
* intel: use swrast code to map/unmap renderbuffers for swrast renderingBrian Paul2012-01-271-79/+2
| | | | (cherry picked from commit 89bb19adb08caaefc01e613e9bbfbdd1f366ddab)
* mesa: update comments, fix whitespace in dd.hBrian Paul2012-01-271-21/+14
| | | | (cherry picked from commit 4baf90353dee771e553c552674616b93aedeaecf)
* swrast: remove unused StoreTexel codeBrian Paul2012-01-274-1187/+183
| | | | | | No longer needed since we do all rendering to texture with the buffer mapping and pixel packing functions. (cherry picked from commit 9403cc3aba0769dc6925cea3ec20aa95d491f516)
* swrast: use Map/UnmapTextureImage() in framebuffer map/unmap codeBrian Paul2012-01-271-15/+13
| | | | | | | | 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)
* mesa: remove ctx->Driver.Map/UnmapTexture() hooksBrian Paul2012-01-273-10/+0
| | | | | No longer used anywhere. (cherry picked from commit 56d83ac4bf0267982554f25c6fdb3c1dd6e14a9c)
* nouveau: stop calling ctx->Driver.Map/UnmapTexture()Brian Paul2012-01-272-40/+4
| | | | | And remove unused nouveau_texture_map/unmap() (cherry picked from commit 8b8a54afd9b748b7250993393864544ad6961edb)
* tnl: remove ctx->Driver.Map/UnmapTexture() callsBrian Paul2012-01-271-8/+2
| | | | | | | 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)
* swrast: move some renderbuffer functions to s_renderbuffer.cBrian Paul2012-01-272-121/+121
| | | | (cherry picked from commit bde356a1580f52cae0aaca020a33a6437083a450)
* intel: remove intel_span_supports_format()Brian Paul2012-01-273-21/+0
| | | | | It always returned True. (cherry picked from commit 1839a7fc9faae81d32ffc0cdc908b933f4524e28)
* swrast: remove a few extra _mesa_get_format_bytes() callsBrian Paul2012-01-271-4/+6
| | | | (cherry picked from commit 6c1e27ba219e41ae2641cca0d3c67462bdba8631)
* mesa: update comments for gl_renderbufferBrian Paul2012-01-271-16/+9
| | | | (cherry picked from commit 1da7d6c919e9a6d756b208caa6685bfa1146b543)
* mesa/swrast/drivers: remove obsolete gl_renderbuffer fieldsBrian Paul2012-01-271-7/+0
| | | | | This removes the last of the legacy fields from gl_renderbuffer. (cherry picked from commit 1888dd52a32e114e7b3796db5a6b44921a2e04d4)
* dri/swrast: use swrast_renderbuffer typeBrian Paul2012-01-272-35/+41
| | | | (cherry picked from commit becbb643135ddccac5054bf138ca0cc7cc3fff15)
* swrast: use swrast_renderbuffer instead of gl_renderbufferBrian Paul2012-01-279-41/+62
| | | | (cherry picked from commit 0c1862851f27c428a18ba5509636efcc2f0084f8)
* osmesa: use swrast_renderbufferBrian Paul2012-01-271-42/+45
| | | | (cherry picked from commit 797c18be1f907337ebd85b18ce43dfa0b056f492)
* radeon: derive radeon_renderbuffer from swrast_renderbufferBrian Paul2012-01-2714-64/+73
| | | | (cherry picked from commit c080202db5363a18a759a9a7c82b40ac558c8abe)
* intel: derive intel_renderbuffer from swrast_renderbufferBrian Paul2012-01-277-49/+55
| | | | | Drivers that rely on swrast need to do this, as with swrast_texture_image. (cherry picked from commit 9f8ed9d66298e2dc5dff508e3ea723469fe06d93)
* xlib: derive xmesa_renderbuffer from swrast_renderbufferBrian Paul2012-01-274-24/+27
| | | | (cherry picked from commit d16e71eeb47d1e67930f6e86a80dc926468224d9)
* swrast: allocate swrast_renderbuffers instead of gl_renderbuffersBrian Paul2012-01-272-7/+7
| | | | (cherry picked from commit f2479530b8be3866c234ac759a7fa84e634dd1aa)
* swrast: new swrast_renderbuffer typeBrian Paul2012-01-271-0/+25
| | | | | This will let us move the swrast-specific fields out of gl_renderbuffer. (cherry picked from commit 34988272d9c7a889a26bb8bdcb841d44797a5dd6)
* intel: use intel_rb_format() to get renderbuffer formatBrian Paul2012-01-2711-42/+56
| | | | | This will make future changes cleaner and less invasive. (cherry picked from commit 924de7dc96f4607cb3d833637b5f69f4b9e2a6d0)
* dri/swrast: rename swrast_renderbuffer to dri_swrast_renderbufferBrian Paul2012-01-272-14/+14
| | | | | | To prevent name collision with future swrast_renderbuffer in the swrast module. (cherry picked from commit 1048d55d5fa60d17dd99ac7394ff0572500625f9)
* swrast: use stencil packing function in s_stencil.cBrian Paul2012-01-271-1/+3
| | | | (cherry picked from commit c45771905f237d9285465dfce955440582ee51e5)
* swrast: use color packing functions in s_span.cBrian Paul2012-01-271-4/+9
| | | | (cherry picked from commit 881ef2a9db22cff4c7d07b873d23b0c324da555a)
* swrast: remove s_spantemp.hBrian Paul2012-01-271-149/+0
| | | | (cherry picked from commit 8696a5210289166ce39d765d771258258400e876)
* xlib: remove xm_span.c and related codeBrian Paul2012-01-276-249/+1
| | | | (cherry picked from commit b0f0d7a8118401b209c674804255b5fd9e8c94c0)
* mesa: remove gl_renderbuffer::WrappedBrian Paul2012-01-277-23/+13
| | | | | There's no such thing as renderbuffer wrappers anymore. (cherry picked from commit 59a5b5a193d5d9c5776aa586b34657b6e315479d)
* swrast: rewrite, simplify the the render-to-texture codeBrian Paul2012-01-271-110/+30
| | | | (cherry picked from commit ab331140c68d1c157e69ea8e53b44729355fa43c)
* mesa: rename gl_renderbuffer::Data to BufferBrian Paul2012-01-277-38/+41
| | | | | To better indicate that this pointer to the malloc'd memory. (cherry picked from commit 7a36345f70a0b8ac2d480bb52eb2c74c2be5a978)
* mesa: move freeing of software renderbuffers into swrastBrian Paul2012-01-272-6/+16
| | | | (cherry picked from commit f6a3979a0444a14c198c10501e9ff13f24625443)
* mesa: remove gl_renderbuffer::DataTypeBrian Paul2012-01-2717-249/+39
| | | | (cherry picked from commit f9874feef4d8952df5054bd8e8f4e0deda4ef44f)
* mesa: remove gl_renderbuffer:RowStride fieldBrian Paul2012-01-279-16/+7
| | | | (cherry picked from commit 1e1b5cb01a10e39d01923e3c7e989c44210950cd)
* mesa: finally, remove the GetRow/PutRow/etc functionsBrian Paul2012-01-271-37/+0
| | | | (cherry picked from commit 82846fea4d042466ccfd5b3c86d98e856086cc05)
* dri: remove all the obsolete spantmp filesBrian Paul2012-01-274-1259/+0
| | | | (cherry picked from commit 304f7a132741a528ca6e861a918ef59991874e5f)
* radeon: remove obsolete GetRow/PutRow codeBrian Paul2012-01-272-167/+0
| | | | (cherry picked from commit a4c6dedb27897ae1340983b5d12927e0a9fb2212)
* nouveau: remove obsolete GetRow/PutRow codeBrian Paul2012-01-271-85/+0
| | | | (cherry picked from commit f892debdc21d12c40d2b69b4e9efdf527672d3ec)
* intel: remove most of the span Get/PutRow codeBrian Paul2012-01-272-134/+1
| | | | (cherry picked from commit 41869c49421141807ab71cabca4c8a07611f6a64)
* dri/swrast: remove obsolete GetRow/PutRow codeBrian Paul2012-01-275-584/+1
| | | | | | | | | | | | | | | | 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
* osmesa: remove obsolete GetRow/PutRow codeBrian Paul2012-01-271-430/+1
| | | | (cherry picked from commit 2873555a76a7358db053c3a7b121b489f8df9bb1)
* xlib: remove obsolete GetRow/PutRow codeBrian Paul2012-01-271-1594/+3
| | | | (cherry picked from commit 2e80c7e5bf822e3b9efd145d33badcf4f14504ff)