summaryrefslogtreecommitdiffstats
path: root/src
Commit message (Collapse)AuthorAgeFilesLines
* ilo: use a helper to determine if HiZ is enabledChia-I Wu2014-01-145-8/+19
| | | | | Add ilo_texture_can_enable_hiz and replace all checks for tex->hiz.bo by calls to ilo_texture_can_enable_hiz().
* ilo: decide on hiz first in texture allocationChia-I Wu2014-01-141-64/+64
| | | | | | | | | Add tex_layout_init_hiz() before tex_layout_init_format() to decide whether HiZ should be enabled. On GEN6, because of layer offsetting, HiZ is enabled only when the texture is non-mipmapped and non-array. PIPE_USAGE_STAGING is also taken as a hint to disable HiZ.
* ilo: emit gen7_wa_pipe_control_wm_max_threads_stall on HaswellChia-I Wu2014-01-141-7/+9
| | | | | | | Rename the workaround, as it is for 3DSTATE_PS instead of 3DSTATE_WM, and emit it on Haswell too. This does not fix any app, but an assertion failure.
* ilo: use HALIGN_4 on GEN7 for depth buffersChia-I Wu2014-01-141-11/+1
| | | | The comment was no longer true since 6642381e7513926b847d6bc10bf590e1c0c54859.
* ilo: OOM for HiZ is fatal on GEN6Chia-I Wu2014-01-141-2/+7
| | | | On GEN6, HiZ and Separate Stencil Buffer must be enabled at the same time.
* ilo: fix a HiZ bo leakageChia-I Wu2014-01-141-0/+3
| | | | Dereference the HiZ bo when the texture is destroyed.
* ilo: simplify ilo_texture_set_slice_flags()Chia-I Wu2014-01-141-5/+3
| | | | | Call ilo_texture_get_slice() for the last slice so that we can get rid of the duplicated assert().
* egl-static: Fix build error.Vinson Lee2014-01-131-1/+1
| | | | | | | | | | | | Fix build regression introduced with commit 786af2f963925df2c2a6fb60b29a83e8340f03c7. egl_pipe.c:46:38: fatal error: radeonsi/radeonsi_public.h: No such file or directory #include "radeonsi/radeonsi_public.h" ^ Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=73578 Signed-off-by: Vinson Lee <[email protected]>
* radeonsi: Rename the commonly occurring rscreen variable.Andreas Hartmetz2014-01-143-86/+86
| | | | | | The "r" stands for R600. Reviewed-by: Marek Olšák <[email protected]>
* radeonsi: Rename the commonly occurring rctx/r600 variables.Andreas Hartmetz2014-01-1418-757/+757
| | | | | | The "r" stands for R600. Reviewed-by: Marek Olšák <[email protected]>
* radeonsi: Rename r600_trace_emit->si_trace_emit.Andreas Hartmetz2014-01-142-2/+2
| | | | | | I had previously considered that unsafe. Reviewed-by: Marek Olšák <[email protected]>
* radeonsi: Rename R600->SI in some remaining defines.Andreas Hartmetz2014-01-148-22/+22
| | | | | | I had previously considered that unsafe. Reviewed-by: Marek Olšák <[email protected]>
* radeonsi: Rename radeonsi->si remaining identifiers in si_uvd.c.Andreas Hartmetz2014-01-141-2/+2
| | | | Reviewed-by: Marek Olšák <[email protected]>
* radeonsi: Rename r600->si remaining identifiers in si_state_draw.c.Andreas Hartmetz2014-01-141-2/+2
| | | | Reviewed-by: Marek Olšák <[email protected]>
* radeonsi: Rename r600->si remaining identifiers in si_resource.c.Andreas Hartmetz2014-01-141-6/+6
| | | | Reviewed-by: Marek Olšák <[email protected]>
* radeonsi: Rename r600->si remaining identifiers in si_query.c.Andreas Hartmetz2014-01-141-18/+18
| | | | Reviewed-by: Marek Olšák <[email protected]>
* radeonsi: Rename r600->si remaining identifiers in si_pipe.c.Andreas Hartmetz2014-01-141-36/+36
| | | | Reviewed-by: Marek Olšák <[email protected]>
* radeonsi: Rename r600->si remaining identifier in si_hw_context.c.Andreas Hartmetz2014-01-141-1/+1
| | | | Reviewed-by: Marek Olšák <[email protected]>
* radeonsi: Rename radeonsi->si remaining identifiers in si_compute.c.Andreas Hartmetz2014-01-141-8/+8
| | | | Reviewed-by: Marek Olšák <[email protected]>
* radeonsi: Rename r600->si remaining identifiers in si_blit.c.Andreas Hartmetz2014-01-141-110/+110
| | | | Reviewed-by: Marek Olšák <[email protected]>
* radeonsi: Rename r600->si for functions in si_pipe.h.Andreas Hartmetz2014-01-1412-57/+57
| | | | Reviewed-by: Marek Olšák <[email protected]>
* radeonsi: Rename r600->si for functions in si.h.Andreas Hartmetz2014-01-144-46/+46
| | | | Reviewed-by: Marek Olšák <[email protected]>
* radeonsi: Rename r600->si for functions in si_resource.h.Andreas Hartmetz2014-01-149-17/+17
| | | | Reviewed-by: Marek Olšák <[email protected]>
* radeonsi: Rename r600->si for structs in si_resource.h.Andreas Hartmetz2014-01-143-7/+7
| | | | Reviewed-by: Marek Olšák <[email protected]>
* radeonsi: Rename r600->si for structs in si.h.Andreas Hartmetz2014-01-143-24/+24
| | | | Reviewed-by: Marek Olšák <[email protected]>
* radeonsi: Rename r600->si for structs in si_pipe.h.Andreas Hartmetz2014-01-1420-195/+195
| | | | Reviewed-by: Marek Olšák <[email protected]>
* radeonsi: Apply si_* file naming scheme.Andreas Hartmetz2014-01-1426-109/+81
| | | | Reviewed-by: Marek Olšák <[email protected]>
* glsl: Remove exec_list iterators now that nothing uses them.Kenneth Graunke2014-01-132-88/+0
| | | | | | Signed-off-by: Kenneth Graunke <[email protected]> Reviewed-by: Matt Turner <[email protected]> Reviewed-by: Ian Romanick <[email protected]>
* glsl: Replace iterators in ir_reader.cpp with ad-hoc list walking.Kenneth Graunke2014-01-131-8/+10
| | | | | | | | | These can't use foreach_list since they want to skip over the first few list elements. Just doing the ad-hoc list walking isn't too bad. Signed-off-by: Kenneth Graunke <[email protected]> Reviewed-by: Matt Turner <[email protected]> Reviewed-by: Ian Romanick <[email protected]>
* glsl: Use a new foreach_two_lists macro for walking two lists at once.Kenneth Graunke2014-01-1312-92/+73
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When handling function calls, we often want to walk through the list of formal parameters and list of actual parameters at the same time. (Both are guaranteed to be the same length.) Previously, we used a pattern of: exec_list_iterator 1st_iter = <1st list>.iterator(); foreach_iter(exec_list_iterator, 2nd_iter, <2nd list>) { ... 1st_iter.next(); } This was awkward, since you had to manually iterate through one of the two lists. This patch introduces a foreach_two_lists macro which safely walks through two lists at the same time, so you can simply do: foreach_two_lists(1st_node, <1st list>, 2nd_node, <2nd list>) { ... } v2: Rename macro from foreach_list2 to foreach_two_lists, as suggested by Ian Romanick. Signed-off-by: Kenneth Graunke <[email protected]> Reviewed-by: Matt Turner <[email protected]> Reviewed-by: Ian Romanick <[email protected]>
* glsl: Statically cast parameter exec_node to ir_variable.Kenneth Graunke2014-01-131-1/+1
| | | | | | | | | Formal function parameters are always ir_variable objects, not an arbitrary ir_instruction. So there's no need to dynamically cast here. Signed-off-by: Kenneth Graunke <[email protected]> Reviewed-by: Matt Turner <[email protected]> Reviewed-by: Ian Romanick <[email protected]>
* glsl: Cast ir_call parameters to ir_rvalue, not ir_instruction.Kenneth Graunke2014-01-134-6/+6
| | | | | | | | | | A function call's parameters are always rvalues. ir_rvalue may not always be a subclass of ir_instruction in the future, so we should use the right one. Signed-off-by: Kenneth Graunke <[email protected]> Reviewed-by: Matt Turner <[email protected]> Reviewed-by: Ian Romanick <[email protected]>
* glsl: Replace foreach_iter and iter.remove() with foreach_list_safe.Kenneth Graunke2014-01-131-6/+6
| | | | | | | | foreach_list_safe allows you to safely remove the current node. Signed-off-by: Kenneth Graunke <[email protected]> Reviewed-by: Matt Turner <[email protected]> Reviewed-by: Ian Romanick <[email protected]>
* glsl: Convert piles of foreach_iter to foreach_list_safe.Kenneth Graunke2014-01-1312-36/+36
| | | | | | | | | In these cases, we edit the list (or at least might be), so we use the foreach_list_safe variant. Signed-off-by: Kenneth Graunke <[email protected]> Reviewed-by: Matt Turner <[email protected]> Reviewed-by: Ian Romanick <[email protected]>
* glsl: Convert piles of foreach_iter to the newer foreach_list macro.Kenneth Graunke2014-01-1326-178/+170
| | | | | | | | | | | | | foreach_iter and exec_list_iterators have been deprecated for some time now; we just hadn't ever bothered to convert code to the newer foreach_list and foreach_list_safe macros. In these cases, we aren't editing the list, so we can use foreach_list rather than foreach_list_safe. Signed-off-by: Kenneth Graunke <[email protected]> Reviewed-by: Matt Turner <[email protected]> Reviewed-by: Ian Romanick <[email protected]>
* i965: Ensure that all necessary state is re-emitted if we run out of aperture.Paul Berry2014-01-133-0/+21
| | | | | | | | | | | | | | | | | | | | | Prior to this patch, if we ran out of aperture space during brw_try_draw_prims(), we would rewind the batch buffer pointer (potentially throwing some state that may have been emitted by brw_upload_state()), flush the batch, and then try again. However, we wouldn't reset the dirty bits to the state they had before the call to brw_upload_state(). As a result, when we tried again, there was a danger that we wouldn't re-emit all the necessary state. (Note: prior to the introduction of hardware contexts, this wasn't a problem because flushing the batch forced all state to be re-emitted). This patch fixes the problem by leaving the dirty bits set at the end of brw_upload_state(); we only clear them after we have determined that we don't need to rewind the batch buffer. Cc: 10.0 9.2 <[email protected]> Reviewed-by: Eric Anholt <[email protected]> Reviewed-by: Kenneth Graunke <[email protected]>
* r600g: fix glClearBuffer by handling PIPE_CLEAR_COLORi flags correctlyMarek Olšák2014-01-131-38/+31
| | | | also restructure the code
* r600g: handle NULL colorbuffers correctly on R600-R700Marek Olšák2014-01-131-65/+55
|
* r600g: handle NULL colorbuffers correctly on EvergreenMarek Olšák2014-01-132-28/+54
|
* radeonsi: handle NULL colorbuffers correctlyMarek Olšák2014-01-131-9/+11
| | | | Reviewed-by: Michel Dänzer <[email protected]>
* gallium/util: easy fixes for NULL colorbuffersMarek Olšák2014-01-132-1/+7
| | | | Reviewed-by: Brian Paul <[email protected]>
* st/mesa: bind NULL colorbuffers as specified by glDrawBuffersMarek Olšák2014-01-136-14/+40
| | | | | | | | | | | | | | | | | | | | An example why it is required: Let's say there's a fragment shader writing to gl_FragData[0..1]. The user calls: glDrawBuffers(2, {GL_NONE, GL_COLOR_ATTACHMENT0}); That means gl_FragData[0] is unused and gl_FragData[1] is written to GL_COLOR_ATTACHMENT0. st/mesa was skipping the GL_NONE draw buffer, therefore gl_FragData[0] was written to GL_COLOR_ATTACHMENT0, which was wrong. This commit fixes it, but drivers must also be fixed not to crash when binding NULL colorbuffers. There is also a new set of piglit tests for this. The MSAA state also had to be fixed not to crash when reading fb->cbufs[0]. Reviewed-by: Brian Paul <[email protected]>
* mesa: handle GL_NONE draw buffers correctly in glClearMarek Olšák2014-01-131-1/+5
| | | | Reviewed-by: Brian Paul <[email protected]>
* st/mesa: use sRGB formats for MSAA resolving if destination is sRGBMarek Olšák2014-01-131-0/+32
| | | | | | Copied from the i965 driver, including the big comment. Cc: 9.2 10.0 <[email protected]>
* st/mesa: check depth and stencil writemask before clearingMarek Olšák2014-01-131-2/+15
|
* st/mesa: always prefer pipe->clear over clear_with_quad (v2)Marek Olšák2014-01-131-5/+14
| | | | v2: clear depth and stencil together
* st/egl: Flush resources before presentationMartin Andersson2014-01-133-0/+24
| | | | | | | Fixes wayland regression on r600g due to fast clear introduced by commit edbbfac6. Signed-off-by: Marek Olšák <[email protected]>
* dri: set yInverted default to GL_TRUETapani Pälli2014-01-131-0/+1
| | | | | | | | | | | | yInverted is used by EGL_NOK_texture_from_pixmap to indicate that window system rendering is y-inverted compared to OpenGL texture representation. This extension is only known to be used with X11 window system where sane default is GL_TRUE. Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=73371 Signed-off-by: Tapani Pälli <[email protected]> Reviewed-by: Chad Versace <[email protected]>
* egl_dri2: call dri2_add_configs_for_visuals after extensions setTapani Pälli2014-01-131-5/+6
| | | | | | | | dri2_add_config makes decisions based on NOK_texture_from_pixmap so it needs to be enabled before calling dri2_add_configs_for_visuals. Signed-off-by: Tapani Pälli <[email protected]> Reviewed-by: Chad Versace <[email protected]>
* mesa: Set the correct error in _mesa_BeginConditionalRenderIan Romanick2014-01-101-11/+30
| | | | | | | | | | | | Piglit was recently changed to expect the correct error code (piglit commit 271b998), so it started failing on Mesa. This corrects that failing and adds some spec quotations to justify the errrors set. The code was rearranged a little bit to match the order listed in the spec. Signed-off-by: Ian Romanick <[email protected]> Reviewed-by: Matt Turner <[email protected]>