Mesa (master): gallium: add PIPE_SHADER_CAP_OUTPUT_READ

Alex Deucher agd5f at kemper.freedesktop.org
Mon Nov 21 22:42:55 UTC 2011


Module: Mesa
Branch: master
Commit: 40864b85aa70b6bc523dbb9792449e6a3dfac4b2
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=40864b85aa70b6bc523dbb9792449e6a3dfac4b2

Author: Vadim Girlin <vadimgirlin at gmail.com>
Date:   Tue Nov 15 19:57:20 2011 +0400

gallium: add PIPE_SHADER_CAP_OUTPUT_READ

It's intended to indicate whether the driver/hardware supports reading
of the values written into shader outputs.

Signed-off-by: Vadim Girlin <vadimgirlin at gmail.com>

---

 src/gallium/auxiliary/tgsi/tgsi_ureg.c |    1 -
 src/gallium/include/pipe/p_defines.h   |    3 ++-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/gallium/auxiliary/tgsi/tgsi_ureg.c b/src/gallium/auxiliary/tgsi/tgsi_ureg.c
index cada435..cd445a6 100644
--- a/src/gallium/auxiliary/tgsi/tgsi_ureg.c
+++ b/src/gallium/auxiliary/tgsi/tgsi_ureg.c
@@ -799,7 +799,6 @@ ureg_emit_src( struct ureg_program *ureg,
    unsigned n = 0;
 
    assert(src.File != TGSI_FILE_NULL);
-   assert(src.File != TGSI_FILE_OUTPUT);
    assert(src.File < TGSI_FILE_COUNT);
    
    out[n].value = 0;
diff --git a/src/gallium/include/pipe/p_defines.h b/src/gallium/include/pipe/p_defines.h
index 5196591..6d6faab 100644
--- a/src/gallium/include/pipe/p_defines.h
+++ b/src/gallium/include/pipe/p_defines.h
@@ -501,7 +501,8 @@ enum pipe_shader_cap
    PIPE_SHADER_CAP_INDIRECT_CONST_ADDR = 15,
    PIPE_SHADER_CAP_SUBROUTINES = 16, /* BGNSUB, ENDSUB, CAL, RET */
    PIPE_SHADER_CAP_INTEGERS = 17,
-   PIPE_SHADER_CAP_MAX_TEXTURE_SAMPLERS = 18
+   PIPE_SHADER_CAP_MAX_TEXTURE_SAMPLERS = 18,
+   PIPE_SHADER_CAP_OUTPUT_READ = 19
 };
 
 




More information about the mesa-commit mailing list