diff options
| author | marha <marha@users.sourceforge.net> | 2014-10-01 23:12:45 +0200 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2014-10-01 23:12:45 +0200 |
| commit | 5fdd0b003e35366f5b80001dab73db85694bea11 (patch) | |
| tree | 37e55f53c3d41c46c0f60ab156ffa642fca88766 /mesalib/src/mesa/drivers/common/meta.h | |
| parent | 88236adfe3eb41b8368b4c9ecf3e09a7199dc474 (diff) | |
| parent | f308aa9cf1ab2ec9e0086e98f07a20aaa79148a1 (diff) | |
| download | vcxsrv-5fdd0b003e35366f5b80001dab73db85694bea11.tar.gz vcxsrv-5fdd0b003e35366f5b80001dab73db85694bea11.tar.bz2 vcxsrv-5fdd0b003e35366f5b80001dab73db85694bea11.zip | |
Merge remote-tracking branch 'origin/released'
Diffstat (limited to 'mesalib/src/mesa/drivers/common/meta.h')
| -rw-r--r-- | mesalib/src/mesa/drivers/common/meta.h | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/mesalib/src/mesa/drivers/common/meta.h b/mesalib/src/mesa/drivers/common/meta.h index edc3e8c20..2c9517b14 100644 --- a/mesalib/src/mesa/drivers/common/meta.h +++ b/mesalib/src/mesa/drivers/common/meta.h @@ -279,6 +279,12 @@ enum blit_msaa_shader { BLIT_MSAA_SHADER_2D_MULTISAMPLE_ARRAY_COPY_UINT, BLIT_MSAA_SHADER_2D_MULTISAMPLE_ARRAY_DEPTH_RESOLVE, BLIT_MSAA_SHADER_2D_MULTISAMPLE_ARRAY_DEPTH_COPY, + BLIT_2X_MSAA_SHADER_2D_MULTISAMPLE_SCALED_RESOLVE, + BLIT_4X_MSAA_SHADER_2D_MULTISAMPLE_SCALED_RESOLVE, + BLIT_8X_MSAA_SHADER_2D_MULTISAMPLE_SCALED_RESOLVE, + BLIT_2X_MSAA_SHADER_2D_MULTISAMPLE_ARRAY_SCALED_RESOLVE, + BLIT_4X_MSAA_SHADER_2D_MULTISAMPLE_ARRAY_SCALED_RESOLVE, + BLIT_8X_MSAA_SHADER_2D_MULTISAMPLE_ARRAY_SCALED_RESOLVE, BLIT_MSAA_SHADER_COUNT, }; |