diff options
author | Marek Olšák <[email protected]> | 2017-04-12 17:45:30 +0200 |
---|---|---|
committer | Marek Olšák <[email protected]> | 2017-04-12 17:46:21 +0200 |
commit | f7b1371d2d479b8e97cdacae2aec94d5c2ba1321 (patch) | |
tree | e458d831853bbf7e1f1c7c177b291c8abe9771cc /src/gallium/drivers/r600/r600_pipe.h | |
parent | bb847e78cfbf14ce7a8f7022ce3033931291e075 (diff) |
Revert "r600g: get rid of dummy pixel shader"
This reverts commit 61e47d92c5196bf0240e322bb1b9d305836559e3.
It causes a hang on RS780.
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=100663
Diffstat (limited to 'src/gallium/drivers/r600/r600_pipe.h')
-rw-r--r-- | src/gallium/drivers/r600/r600_pipe.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/src/gallium/drivers/r600/r600_pipe.h b/src/gallium/drivers/r600/r600_pipe.h index e636ef00246..7f1ecc278b6 100644 --- a/src/gallium/drivers/r600/r600_pipe.h +++ b/src/gallium/drivers/r600/r600_pipe.h @@ -432,6 +432,9 @@ struct r600_context { void *custom_blend_resolve; void *custom_blend_decompress; void *custom_blend_fastclear; + /* With rasterizer discard, there doesn't have to be a pixel shader. + * In that case, we bind this one: */ + void *dummy_pixel_shader; /* These dummy CMASK and FMASK buffers are used to get around the R6xx hardware * bug where valid CMASK and FMASK are required to be present to avoid * a hardlock in certain operations but aren't actually used |