summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* mesa: check that flex/bison are installedBrian Paul2011-06-104-4/+16
| | | | | | | Fixes https://bugs.freedesktop.org/show_bug.cgi?id=36651 NOTE: This is a candidate for the 7.10 branch. (cherry picked from commit de1df26b5c11a45f2b1ff2ddc7b8ec764356aa94)
* mesa: add some missing GLAPIENTRY keywordsBrian Paul2011-06-101-8/+8
| | | | | NOTE: this is a candidate for the 7.10 branch. (cherry picked from commit 355944087365a963d01deb5fcd6727dfd5360470)
* r300g: clear can be killed by render conditionMarek Olšák2011-06-103-7/+35
| | | | | | | | | | Fixes piglit: - NV_conditional_render/clear (cherry picked from commit 76056510bcd35b6b5607b572c0c0ff47b5c5e7e2) Conflicts: src/gallium/drivers/r300/r300_blit.c
* r300g: fix occlusion queries when depth test is disabled or zbuffer is missingMarek Olšák2011-06-102-4/+29
| | | | | | | | | | | | | | | | | | | | | | From now on, depth test is always enabled in hardware. If depth test is disabled in Gallium, the hardware Z function is set to ALWAYS. If there is no zbuffer set, the colorbuffer0 memory is set as a zbuffer to silence the CS checker. This fixes piglit: - occlusion-query-discard - NV_conditional_render/bitmap - NV_conditional_render/drawpixels - NV_conditional_render/vertex_array (cherry picked from commit f76787b3eae3f0b8af839fabfb24b57715a017f6) Conflicts: src/gallium/drivers/r300/r300_state.c Squashed with cherry-picked b1246cf13bc4e301b499a95d33e0cab26655fed5.
* r300g: fix texturing with non-3D textures and wrap R mode set to sample borderMarek Olšák2011-06-091-0/+6
| | | | | | | | | | | | | | | If the wrap R (3rd) mode is set to CLAMP or CLAMP_TO_BORDER and the texture isn't 3D, r300 always samples the border color regardless of texture coordinates. I HATE THIS HARDWARE. NOTE: This is a candidate for the 7.10 branch. (cherry picked from commit da8b4c07986e202b0596b729a5eec31c9aec5fcc) Conflicts: src/gallium/drivers/r300/r300_state_derived.c
* r300g: fix draw_vbo splitting on r3xx-r4xxMarek Olšák2011-06-091-2/+11
| | | | | | | | | NOTE: This is a candidate for the 7.10 branch. (cherry picked from commit 578d4539ba72a9f52e0cb3f615bb04bf9407b574) Conflicts: src/gallium/drivers/r300/r300_render.c
* darwin: Fix VG_LIB_GLOB to also match the unversioned symlinkJeremy Huddleston2011-06-071-1/+1
| | | | | Signed-off-by: Jeremy Huddleston <[email protected]> (cherry picked from commit 6ea70600b9dc76662360eddb41ff658e8ee1aaff)
* darwin: Don't link against libGL when building libOSMesaJeremy Huddleston2011-06-071-1/+1
| | | | | | | Everything should be resolved through glapi. Signed-off-by: Jeremy Huddleston <[email protected]> (cherry picked from commit cebdffaa2a11ef499383a17956c936791e284343)
* darwin: Set VG_LIB_{NAME,GLOB} to fix make installJeremy Huddleston2011-06-061-10/+12
| | | | | Signed-off-by: Jeremy Huddleston <[email protected]> (cherry picked from commit 22c320aa2c459474a0d220a40b849bf7e4864251)
* apple: Package applegl source into MesaLib tarballJeremy Huddleston2011-06-061-0/+12
| | | | | Signed-off-by: Jeremy Huddleston <[email protected]> (cherry picked from commit e5d241ddb231758e0a0f41eee28435d170d583c0)
* darwin: Define GALLIUM_DRIVERS_DIRS in darwin configJeremy Huddleston2011-06-061-0/+2
| | | | | Signed-off-by: Jeremy Huddleston <[email protected]> (cherry picked from commit d563009cd1134557178ddddc29d45b664e58bbed)
* apple: Fix build failures in applegl_glx.cJeremy Huddleston2011-06-062-17/+31
| | | | | | | | | | | See https://bugs.freedesktop.org/show_bug.cgi?id=29162 Signed-off-by: Jeremy Huddleston <[email protected]> This commit squashes three cherry-picks: (cherry picked from commit 5d35343d12ab462100c9eec50a579b73463e465a) (cherry picked from commit 7c5f37c032231ad144a8a5c5a0b18f3e26c0aea7) (cherry picked from commit 2ee5272e1671aff8c8d9e0c12bf37ed006717283)
* apple: Build darwin using applegl rather than indirectJeremy Huddleston2011-06-063-3/+20
| | | | | | | | | | | This reverts portions of 6849916170c0275c13510251a7b217c20f2b993e that caused the darwin config to fail to build due to missing implementations in that commit. See https://bugs.freedesktop.org/show_bug.cgi?id=29162 Signed-off-by: Jeremy Huddleston <[email protected]> (cherry picked from commit 1885cf27c9c4642a049c60a8236cb84735cb9eba)
* glx: Dead code removalJeremy Huddleston2011-06-061-2/+0
| | | | | | | Remove a redundant ifndef GLX_USE_APPLEGL Signed-off-by: Jeremy Huddleston <[email protected]> (cherry picked from commit 3843bbcb4ca4de232dbae6ba3ae619ddfc93508b)
* apple: ifdef out come glapi-foo on darwinJeremy Huddleston2011-06-061-0/+4
| | | | | Signed-off-by: Jeremy Huddleston <[email protected]> (cherry picked from commit 8593bb32eae5368c1ba52504133b0bf200bf8e74)
* apple: Change from XExtDisplayInfo to struct glx_displayJeremy Huddleston2011-06-061-4/+6
| | | | | | | | Fixes regression introduced by: ab434f6b7641a64d30725a9ac24929240362d466 and c356f5867f2c1fad7155df538b9affa8dbdcf869 Signed-off-by: Jeremy Huddleston <[email protected]> (cherry picked from commit 7cdf969527fa6d753ad2eb3dd971fe16725eb440)
* apple: Rename GLXcontextJeremy Huddleston2011-06-061-1/+1
| | | | | | | Fixes regression introduced by: c356f5867f2c1fad7155df538b9affa8dbdcf869 Signed-off-by: Jeremy Huddleston <[email protected]> (cherry picked from commit 279e471750e3ee6a4841ebf16ef2d038e1c12077)
* apple: Rename _gl_context_modes_find_visual to glx_config_find_visualJeremy Huddleston2011-06-061-1/+1
| | | | | | | Fixes regression introduced by: 6ddf66e9230ee862ac341c4767cf6b3b2dd2552b Signed-off-by: Jeremy Huddleston <[email protected]> (cherry picked from commit b7f0ed8444544b7fc927823a903db93ebf723cad)
* apple: Re-add driContext and do_destroyJeremy Huddleston2011-06-061-0/+5
| | | | | | | Fixes regression introduced by: c491e585e43d48a2aeec96ccc4008da6c443fb42 Signed-off-by: Jeremy Huddleston <[email protected]> (cherry picked from commit 488d6c739f5b6cdfa2c670322057c699644d4e52)
* apple: Rename GLXcontextJeremy Huddleston2011-06-064-6/+6
| | | | | | | Fixes regression introduced by: c356f5867f2c1fad7155df538b9affa8dbdcf869 Signed-off-by: Jeremy Huddleston <[email protected]> (cherry picked from commit 22613d1670e3aafcfd3b95191b908a0adabe3eb9)
* apple: Rename __GLcontextModes to struct glx_configJeremy Huddleston2011-06-062-2/+2
| | | | | | | Fixes regression introduced by: 6ddf66e9230ee862ac341c4767cf6b3b2dd2552b Signed-off-by: Jeremy Huddleston <[email protected]> (cherry picked from commit bb621cb61e0c6d7fcd06df5a77c75efe5c76926d)
* apple: Rename glcontextmodes.[ch] to glxconfig.[ch]Jeremy Huddleston2011-06-065-5/+5
| | | | | | | Fixes regression introduced by: 65d98e25770487456eb3d7eb8ec3ec8272f170b1 Signed-off-by: Jeremy Huddleston <[email protected]> (cherry picked from commit 4c9bab78a118953baf307e31cd53e731299f0151)
* apple: Update GL specsJeremy Huddleston2011-06-067-439/+4738
| | | | | Signed-off-by: Jeremy Huddleston <[email protected]> (cherry picked from commit 8e89d0bea7df553a6c937aaa87b1a3c179f69599)
* mesa: fix void pointer arithmetic warningsBrian Paul2011-06-011-21/+18
| | | | | And fix a couple logic errors in the put_*_generic() functions. (cherry picked from commit 7ca38f5d973cf93bf19e27f3f24c0896e43b16e6)
* mesa: queries of non-existent FBO attachments should return INVALID_OPERATIONMarek Olšák2011-06-011-1/+26
| | | | | | | | | | | | OpenGL 4.0 Compatibility, page 449: If the value of FRAMEBUFFER_ATTACHMENT_OBJECT_TYPE is NONE, no framebuffer is bound to target. In this case querying pname FRAMEBUFFER_- ATTACHMENT_OBJECT_NAME will return zero, and all other queries will generate an INVALID_OPERATION error. Reviewed-by: Chad Versace <[email protected]> (cherry picked from commit b9e9df78a03edb35472c2e231aef4747e09db792)
* mesa: UseShaderProgramEXT and Uniform* shouldn't be allowed inside Begin/EndMarek Olšák2011-06-012-0/+6
| | | | | | | I couldn't find this being required by the spec. Reviewed-by: Brian Paul <[email protected]> (cherry picked from commit d69dc2e20346397f4734a0760554a51fb4fbb3c0)
* Revert "intel: Add spans code for the ARB_texture_rg support."Eric Anholt2011-05-311-122/+0
| | | | | | | | | | This reverts what remains of commit 28bab24e1698843e27d27204a1117066e7ffeabb. It was garbage, trying to use a MESA_FORMAT enum as a preprocessor token, and I don't know how I thought it was even tested. Reviewed-by: Brian Paul <[email protected]> (cherry picked from commit bc57df03568e9e1f05b9d29df8e3a7fe58d5a196)
* intel: Use mesa core's R8, RG88, R16, RG1616 RB accessors.Eric Anholt2011-05-311-25/+4
| | | | | | | | Fixes: ARB_texture_rg/fbo-alphatest-formats Reviewed-by: Brian Paul <[email protected]> (cherry picked from commit 73f07004811a2522b45179c74cd9a6d6d2e5c578)
* swrast: Don't try to adjust_colors for <8bpc when handling R16, RG1616.Eric Anholt2011-05-311-3/+3
| | | | | | | | | | The GL_RED and GL_RG were tricking this code into executing, but it's totally unprepared for a 16-bit channel and just rescaled the values down to 0. We don't have anything with <8bit channels alongside >8bit channels, so disabling it should be safe. Reviewed-by: Brian Paul <[email protected]> (cherry picked from commit 2b624634dda23d3b94045fb07aea558df39b48ff)
* mesa: Add renderbuffer accessors for R8/RG88/R16/RG1616.Eric Anholt2011-05-311-0/+310
| | | | | | | | This will replace the current (broken by trying to use an enum in the preprocessor) spantmp2.h support I wrote for the intel driver. Reviewed-by: Brian Paul <[email protected]> (cherry picked from commit f0471d904cf5c03ecf2528268a116e4f147cd3c1)
* mesa: Use _mesa_get_format_bytes to refactor out the RB get_row_*Eric Anholt2011-05-311-60/+10
| | | | | Reviewed-by: Brian Paul <[email protected]> (cherry picked from commit a52803e1087749bfa571c29fc4c1a73fa9b7bf8e)
* mesa: Use _mesa_get_format_bytes to refactor out the RB get_pointer_*Eric Anholt2011-05-313-68/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is a squash of the following two commits: mesa: Use _mesa_get_format_bytes to refactor out the RB get_pointer_* Reviewed-by: Brian Paul <[email protected]> (cherry picked from commit 6ab9889a2704304a45b4da5b28840af08f6f42c5) mesa: Fix return type of _mesa_get_format_bytes() (#37351) Despite that negative values aren't sensible here, making this unsigned is dangerous. Consider get_pointer_generic, which computes a value of the form: void *base + (int x * int stride + int y) * unsigned bpp The usual arithmetic conversions will coerce the (x*stride + y) subexpression to unsigned. Since stride can be negative, this is disastrous. Fixes at least the following piglit tests on Ironlake: fbo/fbo-blit-d24s8 spec/ARB_depth_texture/fbo-clear-formats spec/EXT_packed_depth_stencil/fbo-clear-formats NOTE: This is a candidate for the 7.10 branch. Reviewed-by: Chad Versace <[email protected]> Signed-off-by: Adam Jackson <[email protected]> (cherry picked from commit e8b1c6d6f55f5be3bef25084fdd8b6127517e137)
* intel: Use Mesa core's renderbuffer accessors for depth.Eric Anholt2011-05-312-33/+17
| | | | | | | | | | | | Since we're using GTT mappings now (no manual detiling), there's really nothing special to accessing these buffers, other than needing the new RowStride field of gl_renderbuffer to accomodate padding. Reduces the driver size by 2.7kb, and improves glean depthStencil performance 3-10x (!) Reviewed-by: Brian Paul <[email protected]> (cherry picked from commit 0778fdb002b000e241b042ad65b6da6dd8480454)
* mesa: Add a function to set up the default renderbuffer accessors.Eric Anholt2011-05-312-78/+104
| | | | | Reviewed-by: Brian Paul <[email protected]> (cherry picked from commit 9f164823c79bf933bf88217894129dc2eae0cbed)
* mesa: Add a gl_renderbuffer.RowStride field like textures have.Eric Anholt2011-05-313-53/+66
| | | | | | | | | | This will allow some drivers to reuse the core renderbuffer.c get/put row functions in place of using the spantmp.h macros. Note that unlike textures, we use a signed integer here to allow for handling FBO orientation. Reviewed-by: Brian Paul <[email protected]> (cherry picked from commit 155200c15431f8364114d9a37ec527af81c773a5)
* swrast: Don't assert against glReadPixels of GL_RED and GL_RG.Eric Anholt2011-05-312-2/+8
| | | | | | | | | Everything appears to already be in place for this. Fixes aborts in: ARB_texture_rg/fbo-alphatest-formats-float ARB_texture_rg/fbo-blending-formats-float. Reviewed-by: Brian Paul <[email protected]> (cherry picked from commit 641dd899bd485c194c20a871633797a47e4f912d)
* intel: Use _mesa_base_tex_format for FBO texture attachments.Eric Anholt2011-05-311-1/+1
| | | | | | | | | | | | | The _mesa_base_fbo_format variant doesn't handle some texture internalformats, such as "3". Fixes: fbo-blending-formats. fbo-alphatest-formats EXT_texture_sRGB/fbo-alphatest-formats Reviewed-by: Brian Paul <[email protected]> (cherry picked from commit cd3568c329cff16333455fa2228a7c27b261cf05)
* glsl: Perform type checking on "^^" operands.Eric Anholt2011-05-311-3/+10
| | | | | | | | | | | | We were letting any old operand through, which generally resulted in assertion failures later. Fixes array-logical-xor.vert. Reviewed-by: Kenneth Graunke <[email protected]> Reviewed-by: Chad Versace <[email protected]> Reviewed-by: Ian Romanick <[email protected]> (cherry picked from commit 756c262756b2434efeb2c2a33a180fda0757a6e5)
* glsl: When we've emitted a semantic error for ==, return a bool constant.Eric Anholt2011-05-311-3/+7
| | | | | | | | | | | | This prevents later errors (including an assertion failure) from cascading the failure. Fixes invalid-equality-04.vert. Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=33303 Reviewed-by: Kenneth Graunke <[email protected]> Reviewed-by: Chad Versace <[email protected]> (cherry picked from commit 175829f1a8ab0df7594131cc569462e45c1974ec)
* glsl: Semantically check the RHS of `||' even when short-circuiting.Eric Anholt2011-05-311-6/+5
| | | | | | | | | | | | We just do the AST-to-HIR processing, and only push the instructions if needed in the constant false case. Fixes glslparsertest/glsl2/logic-02.frag Reviewed-by: Kenneth Graunke <[email protected]> Reviewed-by: Chad Versace <[email protected]> Reviewed-by: Ian Romanick <[email protected]> (cherry picked from commit 9e04b190b5f59c5b375645f5756a6edd98a7f90c)
* glsl: Semantically check the RHS of `&&' even when short-circuiting.Eric Anholt2011-05-311-6/+6
| | | | | | | | | | | | We just do the AST-to-HIR processing, and only push the instructions if needed in the constant true case. Fixes glslparsertest/glsl2/logic-01.frag Reviewed-by: Kenneth Graunke <[email protected]> Reviewed-by: Chad Versace <[email protected]> Reviewed-by: Ian Romanick <[email protected]> (cherry picked from commit 7ec0c9789669ac88fcdd66c562e6d58281b477ce)
* glsl: Avoid cascading errors when looking for a scalar boolean and failing.Eric Anholt2011-05-311-76/+48
| | | | | | | | | | | | | | | | By always using a boolean, we should generally avoid further complaints. The failure case I see is logic_not, where the user might understandably make the mistake of using `!' on a boolean vector (like a piglit case did recently!), and then get a further complaint that the new boolean type doesn't match the bvec it gets assigned to. Fixes invalid-logic-not-06.vert (assertion failure when the bad type ends up in an expression and ir_constant_expression gets angry). Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=33314 Reviewed-by: Kenneth Graunke <[email protected]> Reviewed-by: Ian Romanick <[email protected]> (cherry picked from commit 01822706ec2c2501a2cd2431a90c56b334b79a5c)
* i965: Never enable the GS on Gen6.Kenneth Graunke2011-05-311-32/+16
| | | | | | | | | | | | | | Prior to Gen6, we use the GS for breaking down quads, quad-strips, and line loops. On Gen6, earlier stages already take care of this, so we never need the GS. Since this code is likely completely untested, remove it for now. We can write new code when enabling real geometry shaders. Signed-off-by: Kenneth Graunke <[email protected]> Reviewed-by: Ian Romanick <[email protected]> Reviewed-by: Eric Anholt <[email protected]> (cherry picked from commit 35b3f597bd1729da4483857cc0e88e81fb2a2419)
* i965: Rename various gen6 #defines to match the documentation.Kenneth Graunke2011-05-3112-33/+33
| | | | | | | | | This should make it easier to cross-reference the code and hardware documentation, as well as clear up any confusion on whether constants like CMD_3D_WM_STATE mean WM_STATE (pre-gen6) or 3DSTATE_WM (gen6+). This does not rename any pre-gen6 defines. (cherry picked from commit e31defc825ee94f1d1092e277954abad7097c552)
* texstore: fix regression stricter check for memcpy path for unorm88 and ↵Hans de Goede2011-05-311-4/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | unorm1616 According to https://bugs.freedesktop.org/show_bug.cgi?id=34280 commit 5d1387b2da3626326410804026f8b92f1a121fdc causes the font corruption problems people have been seeing under various apps and gnome-shell on r200 cards. This commit changed (loosened) the check for using the memcpy path in the former al88 / al1616 texstore functions, which are now also used to store rg texures. This patch restores the old strict check in case of al textures. I've no idea why this fixes things, since I don't know the code in question at all. But after seeing the bisect in bfdo34280 point to this commit, I gave this fix a try and it fixes the font issues seen on r200 cards. [airlied: r200 has no native working A8, so it does an internal storage format of AL88 however srcFormat == internalFormat == ALPHA when we get to this point, so it copies, but it wants to store into an AL88 not ALPHA so fails, I'll also push a piglit test for this on r200]. Many thanks to Nicolas Kaiser who did all the hard work of tracking this down! Signed-off-by: Hans de Goede <[email protected]> Signed-off-by: Dave Airlie <[email protected]> (cherry picked from commit e338a1b0cea94f8c57968b01eebd795c6c8ce74e)
* i965: Remove hint_gs_always and resulting dead codeIan Romanick2011-05-313-76/+13
| | | | | | Reviewed-by: Eric Anholt <[email protected]> Reviewed-by: Kenneth Graunke <[email protected]> (cherry picked from commit a7fa203f0d645bdb06b3cb345ab1a0ccf4e62fe3)
* glx: Only remove the glx_display from the list after it's destroyed.Henri Verbeet2011-05-311-3/+8
| | | | | Signed-off-by: Henri Verbeet <[email protected]> (cherry picked from commit a26121f37530619610a78a5fbe5ef87e44047fda)
* glx: Destroy dri2Hash on DRI2 display destruction.Henri Verbeet2011-05-311-0/+3
| | | | | Signed-off-by: Henri Verbeet <[email protected]> (cherry picked from commit a75de67c51e9124a7c3846b4110552ea28c60349)
* mesa: Also update the color draw buffer if it's explicitly set to GL_NONE.Henri Verbeet2011-05-311-1/+1
| | | | | | | NOTE: This is a candidate for the 7.10 branch. Signed-off-by: Henri Verbeet <[email protected]> (cherry picked from commit 158d42c8b08411d761fa40299f3f29027ad3905f)
* mesa: forbid UseProgram to be called inside Begin/EndMarek Olšák2011-06-011-0/+2
| | | | | | | | | | The spec doesn't state it should be an error, but. We have this piglit test useprogram-inside-begin that passes with this commit. No idea what's correct. NOTE: This is a candidate for the 7.10 branch. Reviewed-by: Brian Paul <[email protected]> (cherry picked from commit 29ceeeba2004f71ccb91ce67f518dc1bf0ca6b17)
generated by cgit v1.2.3 (git 2.39.1) at 2024-12-13 23:37:02 +0000