Mesa (master): anv/entrypoints: make vkGetDeviceProcAddr return NULL for instance commands
Module: Mesa Branch: master Commit: af5f2322d0c64f2909944097f69a7151fe68566d URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=af5f2322d0c64f2909944097f69a7151fe68566d Author: Iago Toral Quiroga Date: Wed Feb 7 09:21:47 2018 +0100 anv/entrypoints: make vkGetDeviceProcAddr return NULL for instance commands Reviewed-by: Lionel Landwerlin Reviewed-by: Jason Ekstrand --- src/intel/vulkan/anv_entrypoints_gen.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/intel/vulkan/anv_entrypoints_gen.py b/src/intel/vulkan/anv_entrypoints_gen.py index c5a654f19b..34ffedb116 100644 --- a/src/intel/vulkan/anv_entrypoints_gen.py +++ b/src/intel/vulkan/anv_entrypoints_gen.py @@ -225,7 +225,7 @@ anv_entrypoint_is_enabled(int index, uint32_t core_version, return ${e.core_version.c_vk_version()} <= core_version; % elif e.extension: % if e.extension.type == 'instance': - return instance->${e.extension.name[3:]}; + return !device && instance->${e.extension.name[3:]}; % else: return !device || device->${e.extension.name[3:]}; % endif ___ mesa-commit mailing list mesa-commit@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/mesa-commit
Mesa (master): st/dri: only expose config formats that are display targets
Module: Mesa Branch: master Commit: f7604d8af521f39e6d5df62981c3b9e10140cc81 URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=f7604d8af521f39e6d5df62981c3b9e10140cc81 Author: Ilia Mirkin Date: Sun Dec 31 02:36:39 2017 -0500 st/dri: only expose config formats that are display targets In the case of NVIDIA hardware, ABGR is displayable but ARGB is not. Only advertise the one set in the visuals list. Signed-off-by: Ilia Mirkin Reviewed-by: Marek Olšák Acked-by: Daniel Stone --- src/gallium/state_trackers/dri/dri_screen.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/gallium/state_trackers/dri/dri_screen.c b/src/gallium/state_trackers/dri/dri_screen.c index bd0925b905..aaee987077 100644 --- a/src/gallium/state_trackers/dri/dri_screen.c +++ b/src/gallium/state_trackers/dri/dri_screen.c @@ -249,7 +249,8 @@ dri_fill_in_modes(struct dri_screen *screen) if (!p_screen->is_format_supported(p_screen, pipe_formats[format], PIPE_TEXTURE_2D, 0, - PIPE_BIND_RENDER_TARGET)) + PIPE_BIND_RENDER_TARGET | + PIPE_BIND_DISPLAY_TARGET)) continue; for (i = 1; i <= msaa_samples_max; i++) { ___ mesa-commit mailing list mesa-commit@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/mesa-commit
Mesa (master): radeonsi: rename variables tgsi_binary -> ir_binary
Module: Mesa Branch: master Commit: 2b431808abf5599a862d1a9150f7b8fa705db036 URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=2b431808abf5599a862d1a9150f7b8fa705db036 Author: Timothy Arceri Date: Thu Feb 15 16:58:07 2018 +1100 radeonsi: rename variables tgsi_binary -> ir_binary This better represents that the ir could be either tgsi or nir. Reviewed-by: Marek Olšák --- src/gallium/drivers/radeonsi/si_state_shaders.c | 42 - 1 file changed, 21 insertions(+), 21 deletions(-) diff --git a/src/gallium/drivers/radeonsi/si_state_shaders.c b/src/gallium/drivers/radeonsi/si_state_shaders.c index 2c1d9901ce..8c9b5a0099 100644 --- a/src/gallium/drivers/radeonsi/si_state_shaders.c +++ b/src/gallium/drivers/radeonsi/si_state_shaders.c @@ -182,10 +182,10 @@ static bool si_load_shader_binary(struct si_shader *shader, void *binary) * Insert a shader into the cache. It's assumed the shader is not in the cache. * Use si_shader_cache_load_shader before calling this. * - * Returns false on failure, in which case the tgsi_binary should be freed. + * Returns false on failure, in which case the ir_binary should be freed. */ static bool si_shader_cache_insert_shader(struct si_screen *sscreen, - void *tgsi_binary, + void *ir_binary, struct si_shader *shader, bool insert_into_disk_cache) { @@ -193,7 +193,7 @@ static bool si_shader_cache_insert_shader(struct si_screen *sscreen, struct hash_entry *entry; uint8_t key[CACHE_KEY_SIZE]; - entry = _mesa_hash_table_search(sscreen->shader_cache, tgsi_binary); + entry = _mesa_hash_table_search(sscreen->shader_cache, ir_binary); if (entry) return false; /* already added */ @@ -201,15 +201,15 @@ static bool si_shader_cache_insert_shader(struct si_screen *sscreen, if (!hw_binary) return false; - if (_mesa_hash_table_insert(sscreen->shader_cache, tgsi_binary, + if (_mesa_hash_table_insert(sscreen->shader_cache, ir_binary, hw_binary) == NULL) { FREE(hw_binary); return false; } if (sscreen->disk_shader_cache && insert_into_disk_cache) { - disk_cache_compute_key(sscreen->disk_shader_cache, tgsi_binary, - *((uint32_t *)tgsi_binary), key); + disk_cache_compute_key(sscreen->disk_shader_cache, ir_binary, + *((uint32_t *)ir_binary), key); disk_cache_put(sscreen->disk_shader_cache, key, hw_binary, *((uint32_t *) hw_binary), NULL); } @@ -218,18 +218,18 @@ static bool si_shader_cache_insert_shader(struct si_screen *sscreen, } static bool si_shader_cache_load_shader(struct si_screen *sscreen, - void *tgsi_binary, + void *ir_binary, struct si_shader *shader) { struct hash_entry *entry = - _mesa_hash_table_search(sscreen->shader_cache, tgsi_binary); + _mesa_hash_table_search(sscreen->shader_cache, ir_binary); if (!entry) { if (sscreen->disk_shader_cache) { unsigned char sha1[CACHE_KEY_SIZE]; - size_t tg_size = *((uint32_t *) tgsi_binary); + size_t tg_size = *((uint32_t *) ir_binary); disk_cache_compute_key(sscreen->disk_shader_cache, - tgsi_binary, tg_size, sha1); + ir_binary, tg_size, sha1); size_t binary_size; uint8_t *buffer = @@ -260,15 +260,15 @@ static bool si_shader_cache_load_shader(struct si_screen *sscreen, } free(buffer); - if (!si_shader_cache_insert_shader(sscreen, tgsi_binary, + if (!si_shader_cache_insert_shader(sscreen, ir_binary, shader, false)) - FREE(tgsi_binary); + FREE(ir_binary); } else { return false; } } else { if (si_load_shader_binary(shader, entry->data)) - FREE(tgsi_binary); + FREE(ir_binary); else return false; } @@ -1797,7 +1797,7 @@ static void si_init_shader_selector_async(void *job, int thread_index) */ if (!sscreen->use_monolithic_shaders) { struct si_shader *shader = CALLOC_STRUCT(si_shader); -
Mesa (master): mesa: add xbgr support adjacent to xrgb
Module: Mesa Branch: master Commit: ebdc4c31e23ffd5ce0d1fc47dd8f76c146961e25 URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=ebdc4c31e23ffd5ce0d1fc47dd8f76c146961e25 Author: Ilia Mirkin Date: Sun Dec 31 01:05:06 2017 -0500 mesa: add xbgr support adjacent to xrgb Signed-off-by: Ilia Mirkin Acked-by: Daniel Stone --- include/GL/internal/dri_interface.h | 2 ++ src/gallium/state_trackers/dri/dri2.c | 36 +++ src/gallium/state_trackers/dri/dri_drawable.c | 3 +++ src/gallium/state_trackers/dri/dri_screen.c | 17 - src/loader/loader_dri3_helper.c | 4 +++ src/mesa/drivers/dri/common/utils.c | 10 src/mesa/main/framebuffer.c | 4 ++- src/mesa/state_tracker/st_cb_fbo.c| 2 ++ 8 files changed, 76 insertions(+), 2 deletions(-) diff --git a/include/GL/internal/dri_interface.h b/include/GL/internal/dri_interface.h index a0c11f184c..4f4795c7ae 100644 --- a/include/GL/internal/dri_interface.h +++ b/include/GL/internal/dri_interface.h @@ -1251,6 +1251,8 @@ struct __DRIdri2ExtensionRec { #define __DRI_IMAGE_FORMAT_R16 0x100d #define __DRI_IMAGE_FORMAT_GR1616 0x100e #define __DRI_IMAGE_FORMAT_YUYV 0x100f +#define __DRI_IMAGE_FORMAT_XBGR2101010 0x1010 +#define __DRI_IMAGE_FORMAT_ABGR2101010 0x1011 #define __DRI_IMAGE_USE_SHARE 0x0001 #define __DRI_IMAGE_USE_SCANOUT0x0002 diff --git a/src/gallium/state_trackers/dri/dri2.c b/src/gallium/state_trackers/dri/dri2.c index 415002d2cd..2a3a2a805b 100644 --- a/src/gallium/state_trackers/dri/dri2.c +++ b/src/gallium/state_trackers/dri/dri2.c @@ -57,6 +57,8 @@ static const int fourcc_formats[] = { __DRI_IMAGE_FOURCC_ARGB2101010, __DRI_IMAGE_FOURCC_XRGB2101010, + __DRI_IMAGE_FOURCC_ABGR2101010, + __DRI_IMAGE_FOURCC_XBGR2101010, __DRI_IMAGE_FOURCC_ARGB, __DRI_IMAGE_FOURCC_ABGR, __DRI_IMAGE_FOURCC_SARGB, @@ -115,6 +117,14 @@ static int convert_fourcc(int format, int *dri_components_p) format = __DRI_IMAGE_FORMAT_XRGB2101010; dri_components = __DRI_IMAGE_COMPONENTS_RGB; break; + case __DRI_IMAGE_FOURCC_ABGR2101010: + format = __DRI_IMAGE_FORMAT_ABGR2101010; + dri_components = __DRI_IMAGE_COMPONENTS_RGBA; + break; + case __DRI_IMAGE_FOURCC_XBGR2101010: + format = __DRI_IMAGE_FORMAT_XBGR2101010; + dri_components = __DRI_IMAGE_COMPONENTS_RGB; + break; case __DRI_IMAGE_FOURCC_R8: format = __DRI_IMAGE_FORMAT_R8; dri_components = __DRI_IMAGE_COMPONENTS_R; @@ -186,6 +196,12 @@ static int convert_to_fourcc(int format) case __DRI_IMAGE_FORMAT_XRGB2101010: format = __DRI_IMAGE_FOURCC_XRGB2101010; break; + case __DRI_IMAGE_FORMAT_ABGR2101010: + format = __DRI_IMAGE_FOURCC_ABGR2101010; + break; + case __DRI_IMAGE_FORMAT_XBGR2101010: + format = __DRI_IMAGE_FOURCC_XBGR2101010; + break; case __DRI_IMAGE_FORMAT_R8: format = __DRI_IMAGE_FOURCC_R8; break; @@ -224,6 +240,12 @@ static enum pipe_format dri2_format_to_pipe_format (int format) case __DRI_IMAGE_FORMAT_ARGB2101010: pf = PIPE_FORMAT_B10G10R10A2_UNORM; break; + case __DRI_IMAGE_FORMAT_XBGR2101010: + pf = PIPE_FORMAT_R10G10B10X2_UNORM; + break; + case __DRI_IMAGE_FORMAT_ABGR2101010: + pf = PIPE_FORMAT_R10G10B10A2_UNORM; + break; case __DRI_IMAGE_FORMAT_R8: pf = PIPE_FORMAT_R8_UNORM; break; @@ -288,6 +310,12 @@ static enum pipe_format fourcc_to_pipe_format(int fourcc) case __DRI_IMAGE_FOURCC_XRGB2101010: pf = PIPE_FORMAT_B10G10R10X2_UNORM; break; + case __DRI_IMAGE_FOURCC_ABGR2101010: + pf = PIPE_FORMAT_R10G10B10A2_UNORM; + break; + case __DRI_IMAGE_FOURCC_XBGR2101010: + pf = PIPE_FORMAT_R10G10B10X2_UNORM; + break; case __DRI_IMAGE_FOURCC_NV12: pf = PIPE_FORMAT_NV12; @@ -406,10 +434,12 @@ dri2_drawable_get_buffers(struct dri_drawable *drawable, */ switch(format) { case PIPE_FORMAT_B10G10R10A2_UNORM: + case PIPE_FORMAT_R10G10B10A2_UNORM: case PIPE_FORMAT_BGRA_UNORM: case PIPE_FORMAT_RGBA_UNORM: depth = 32; break; + case PIPE_FORMAT_R10G10B10X2_UNORM: case PIPE_FORMAT_B10G10R10X2_UNORM: depth = 30; break; @@ -502,6 +532,12 @@ dri_image_drawable_get_buffers(struct dri_drawable *drawable, case PIPE_FORMAT_B10G10R10A2_UNORM: image_format = __DRI_IMAGE_FORMAT_ARGB2101010; break; + case PIPE_FORMAT_R10G10B10X2_UNORM: + image_format = __DRI_IMAGE_FORMAT_XBGR2101010; + break; + case PIPE_FORMAT_R10G10B10A2_UNORM: + image_format = __DRI_IMAGE_FORMAT_ABGR2101010; + break; default: image_format = __DRI_IMAGE_FORMAT_NONE; break; diff --git a/src/gallium/state_trackers/dri/dri_drawable.c
Mesa (master): st/shader_cache: copy nir pointer to gl_program after deserializing
Module: Mesa Branch: master Commit: d88a2906f86843fa11d95f7ac2f39cd0b2713d72 URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=d88a2906f86843fa11d95f7ac2f39cd0b2713d72 Author: Timothy Arceri Date: Fri Feb 16 11:41:17 2018 +1100 st/shader_cache: copy nir pointer to gl_program after deserializing This fixes a crash when running the arb_get_program_binary-api-errors piglit test twice. Reviewed-by: Marek Olšák --- src/mesa/state_tracker/st_shader_cache.c | 6 ++ 1 file changed, 6 insertions(+) diff --git a/src/mesa/state_tracker/st_shader_cache.c b/src/mesa/state_tracker/st_shader_cache.c index 6ff404220a..3ca3fef1df 100644 --- a/src/mesa/state_tracker/st_shader_cache.c +++ b/src/mesa/state_tracker/st_shader_cache.c @@ -215,6 +215,7 @@ st_deserialise_ir_program(struct gl_context *ctx, stvp->tgsi.type = PIPE_SHADER_IR_NIR; stvp->shader_program = shProg; stvp->tgsi.ir.nir = nir_deserialize(NULL, options, &blob_reader); + prog->nir = stvp->tgsi.ir.nir; } else { read_tgsi_from_cache(&blob_reader, &stvp->tgsi.tokens, &stvp->num_tgsi_tokens); @@ -237,6 +238,7 @@ st_deserialise_ir_program(struct gl_context *ctx, sttcp->tgsi.type = PIPE_SHADER_IR_NIR; sttcp->shader_program = shProg; sttcp->tgsi.ir.nir = nir_deserialize(NULL, options, &blob_reader); + prog->nir = sttcp->tgsi.ir.nir; } else { read_tgsi_from_cache(&blob_reader, &sttcp->tgsi.tokens, &sttcp->num_tgsi_tokens); @@ -259,6 +261,7 @@ st_deserialise_ir_program(struct gl_context *ctx, sttep->tgsi.type = PIPE_SHADER_IR_NIR; sttep->shader_program = shProg; sttep->tgsi.ir.nir = nir_deserialize(NULL, options, &blob_reader); + prog->nir = sttep->tgsi.ir.nir; } else { read_tgsi_from_cache(&blob_reader, &sttep->tgsi.tokens, &sttep->num_tgsi_tokens); @@ -281,6 +284,7 @@ st_deserialise_ir_program(struct gl_context *ctx, stgp->tgsi.type = PIPE_SHADER_IR_NIR; stgp->shader_program = shProg; stgp->tgsi.ir.nir = nir_deserialize(NULL, options, &blob_reader); + prog->nir = stgp->tgsi.ir.nir; } else { read_tgsi_from_cache(&blob_reader, &stgp->tgsi.tokens, &stgp->num_tgsi_tokens); @@ -300,6 +304,7 @@ st_deserialise_ir_program(struct gl_context *ctx, stfp->tgsi.type = PIPE_SHADER_IR_NIR; stfp->shader_program = shProg; stfp->tgsi.ir.nir = nir_deserialize(NULL, options, &blob_reader); + prog->nir = stfp->tgsi.ir.nir; } else { read_tgsi_from_cache(&blob_reader, &stfp->tgsi.tokens, &stfp->num_tgsi_tokens); @@ -319,6 +324,7 @@ st_deserialise_ir_program(struct gl_context *ctx, stcp->tgsi.ir_type = PIPE_SHADER_IR_NIR; stcp->shader_program = shProg; stcp->tgsi.prog = nir_deserialize(NULL, options, &blob_reader); + prog->nir = (nir_shader *) stcp->tgsi.prog; } else { read_tgsi_from_cache(&blob_reader, (const struct tgsi_token**) &stcp->tgsi.prog, ___ mesa-commit mailing list mesa-commit@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/mesa-commit
Mesa (master): radeonsi: add nir shader cache support
Module: Mesa Branch: master Commit: 691c320de066ba71c61ad97a1a8b39687238d6ef URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=691c320de066ba71c61ad97a1a8b39687238d6ef Author: Timothy Arceri Date: Fri Feb 16 10:14:05 2018 +1100 radeonsi: add nir shader cache support In future we might want to try avoid calling nir_serialize() but this works for now. Reviewed-by: Marek Olšák --- src/gallium/drivers/radeonsi/si_state_shaders.c | 41 ++--- 1 file changed, 30 insertions(+), 11 deletions(-) diff --git a/src/gallium/drivers/radeonsi/si_state_shaders.c b/src/gallium/drivers/radeonsi/si_state_shaders.c index 8c9b5a0099..357c75aa37 100644 --- a/src/gallium/drivers/radeonsi/si_state_shaders.c +++ b/src/gallium/drivers/radeonsi/si_state_shaders.c @@ -26,6 +26,7 @@ #include "gfx9d.h" #include "radeon/r600_cs.h" +#include "compiler/nir/nir_serialize.h" #include "tgsi/tgsi_parse.h" #include "tgsi/tgsi_ureg.h" #include "util/hash_table.h" @@ -42,22 +43,40 @@ /* SHADER_CACHE */ /** - * Return the TGSI binary in a buffer. The first 4 bytes contain its size as - * integer. + * Return the IR binary in a buffer. For TGSI the first 4 bytes contain its + * size as integer. */ -static void *si_get_tgsi_binary(struct si_shader_selector *sel) +static void *si_get_ir_binary(struct si_shader_selector *sel) { - unsigned tgsi_size = tgsi_num_tokens(sel->tokens) * -sizeof(struct tgsi_token); - unsigned size = 4 + tgsi_size + sizeof(sel->so); - char *result = (char*)MALLOC(size); + struct blob blob; + unsigned ir_size; + void *ir_binary; + + if (sel->tokens) { + ir_binary = sel->tokens; + ir_size = tgsi_num_tokens(sel->tokens) * + sizeof(struct tgsi_token); + } else { + assert(sel->nir); + + blob_init(&blob); + nir_serialize(&blob, sel->nir); + ir_binary = blob.data; + ir_size = blob.size; + } + unsigned size = 4 + ir_size + sizeof(sel->so); + char *result = (char*)MALLOC(size); if (!result) return NULL; *((uint32_t*)result) = size; - memcpy(result + 4, sel->tokens, tgsi_size); - memcpy(result + 4 + tgsi_size, &sel->so, sizeof(sel->so)); + memcpy(result + 4, ir_binary, ir_size); + memcpy(result + 4 + ir_size, &sel->so, sizeof(sel->so)); + + if (sel->nir) + blob_finish(&blob); + return result; } @@ -1813,8 +1832,8 @@ static void si_init_shader_selector_async(void *job, int thread_index) sel->so.num_outputs != 0, &shader->key); - if (sel->tokens) - ir_binary = si_get_tgsi_binary(sel); + if (sel->tokens || sel->nir) + ir_binary = si_get_ir_binary(sel); /* Try to load the shader from the shader cache. */ mtx_lock(&sscreen->shader_cache_mutex); ___ mesa-commit mailing list mesa-commit@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/mesa-commit
Mesa (master): nv50,nvc0: mark ABGR format as displayable instead of ARGB format
Module: Mesa Branch: master Commit: e1a70aed10dcb28b5285221a6cf318bc0e6fe4a2 URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=e1a70aed10dcb28b5285221a6cf318bc0e6fe4a2 Author: Ilia Mirkin Date: Sun Dec 31 02:39:11 2017 -0500 nv50,nvc0: mark ABGR format as displayable instead of ARGB format This matches the hardware's capabilities. Signed-off-by: Ilia Mirkin --- src/gallium/drivers/nouveau/nv50/nv50_formats.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/gallium/drivers/nouveau/nv50/nv50_formats.c b/src/gallium/drivers/nouveau/nv50/nv50_formats.c index 706c34f0db..fc5deac2d5 100644 --- a/src/gallium/drivers/nouveau/nv50/nv50_formats.c +++ b/src/gallium/drivers/nouveau/nv50/nv50_formats.c @@ -152,8 +152,8 @@ const struct nv50_format nv50_format_table[PIPE_FORMAT_COUNT] = F3(A, B4G4R4X4_UNORM, NONE, B, G, R, xx, UNORM, A4B4G4R4, T), F3(A, R9G9B9E5_FLOAT, NONE, R, G, B, xx, FLOAT, E5B9G9R9_SHAREDEXP, T), - C4(A, R10G10B10A2_UNORM, RGB10_A2_UNORM, R, G, B, A, UNORM, A2B10G10R10, IB), - C4(A, B10G10R10A2_UNORM, BGR10_A2_UNORM, B, G, R, A, UNORM, A2B10G10R10, TD), + C4(A, R10G10B10A2_UNORM, RGB10_A2_UNORM, R, G, B, A, UNORM, A2B10G10R10, TD), + C4(A, B10G10R10A2_UNORM, BGR10_A2_UNORM, B, G, R, A, UNORM, A2B10G10R10, IB), C4(A, R10G10B10A2_SNORM, NONE, R, G, B, A, SNORM, A2B10G10R10, T), C4(A, B10G10R10A2_SNORM, NONE, B, G, R, A, SNORM, A2B10G10R10, T), C4(A, R10G10B10A2_UINT, RGB10_A2_UINT, R, G, B, A, UINT, A2B10G10R10, TR), ___ mesa-commit mailing list mesa-commit@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/mesa-commit
Mesa (master): docs: add sha256 checksums for 17.3.5
Module: Mesa Branch: master Commit: be5a9960392b2610d89fb23e0c0ec66b5ce7 URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=be5a9960392b2610d89fb23e0c0ec66b5ce7 Author: Emil Velikov Date: Mon Feb 19 22:07:23 2018 + docs: add sha256 checksums for 17.3.5 Signed-off-by: Emil Velikov (cherry picked from commit 164a993112cc7278d46b7ec8f7f617eb683b212c) --- docs/relnotes/17.3.5.html | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/docs/relnotes/17.3.5.html b/docs/relnotes/17.3.5.html index cf9536bf5b..6dc55c9be1 100644 --- a/docs/relnotes/17.3.5.html +++ b/docs/relnotes/17.3.5.html @@ -31,7 +31,8 @@ because compatibility contexts are not supported. SHA256 checksums -TBD +bc1ee20366aae2affc37c89228f871f438136f70252005e9f842169bde976788 mesa-17.3.5.tar.gz +eb9228fc8aaa71e0205c1481c5b157752ebaec9b646b030d27478e25a6d7936a mesa-17.3.5.tar.xz ___ mesa-commit mailing list mesa-commit@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/mesa-commit
Mesa (17.3): docs: add sha256 checksums for 17.3.5
Module: Mesa Branch: 17.3 Commit: 164a993112cc7278d46b7ec8f7f617eb683b212c URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=164a993112cc7278d46b7ec8f7f617eb683b212c Author: Emil Velikov Date: Mon Feb 19 22:07:23 2018 + docs: add sha256 checksums for 17.3.5 Signed-off-by: Emil Velikov --- docs/relnotes/17.3.5.html | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/docs/relnotes/17.3.5.html b/docs/relnotes/17.3.5.html index cf9536bf5b..6dc55c9be1 100644 --- a/docs/relnotes/17.3.5.html +++ b/docs/relnotes/17.3.5.html @@ -31,7 +31,8 @@ because compatibility contexts are not supported. SHA256 checksums -TBD +bc1ee20366aae2affc37c89228f871f438136f70252005e9f842169bde976788 mesa-17.3.5.tar.gz +eb9228fc8aaa71e0205c1481c5b157752ebaec9b646b030d27478e25a6d7936a mesa-17.3.5.tar.xz ___ mesa-commit mailing list mesa-commit@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/mesa-commit
Mesa (master): docs: update calendar, add news and link release notes to 17.3.5
Module: Mesa Branch: master Commit: 127099043896f3695cde2e5a5e9037bc01ec9123 URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=127099043896f3695cde2e5a5e9037bc01ec9123 Author: Emil Velikov Date: Mon Feb 19 22:10:18 2018 + docs: update calendar, add news and link release notes to 17.3.5 Signed-off-by: Emil Velikov --- docs/index.html| 6 ++ docs/release-calendar.html | 4 ++-- docs/relnotes.html | 1 + 3 files changed, 9 insertions(+), 2 deletions(-) diff --git a/docs/index.html b/docs/index.html index 4fca33b361..d58f757ca3 100644 --- a/docs/index.html +++ b/docs/index.html @@ -16,6 +16,12 @@ News +February 19, 2018 + +Mesa 17.3.5 is released. +This is a bug-fix release. + + February 15, 2018 Mesa 17.3.4 is released. diff --git a/docs/release-calendar.html b/docs/release-calendar.html index b9208324b9..43a2f9609c 100644 --- a/docs/release-calendar.html +++ b/docs/release-calendar.html @@ -41,13 +41,13 @@ if you'd like to nominate a patch in the next stable release. 17.3 2018-02-23 -17.3.5 +17.3.6 Juan A. Suarez Romero 2018-03-09 -17.3.6 +17.3.7 Juan A. Suarez Romero Final planned release for the 17.3 series diff --git a/docs/relnotes.html b/docs/relnotes.html index 60aa262f94..da072b6c8b 100644 --- a/docs/relnotes.html +++ b/docs/relnotes.html @@ -21,6 +21,7 @@ The release notes summarize what's new or changed in each Mesa release. +17.3.5 release notes 17.3.4 release notes 17.3.3 release notes 17.3.2 release notes ___ mesa-commit mailing list mesa-commit@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/mesa-commit
Mesa (master): docs: add release notes for 17.3.5
Module: Mesa Branch: master Commit: ca614d40cd2cee563089ec8edcbbeb7b005cf84f URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=ca614d40cd2cee563089ec8edcbbeb7b005cf84f Author: Emil Velikov Date: Mon Feb 19 22:01:35 2018 + docs: add release notes for 17.3.5 Signed-off-by: Emil Velikov (cherry picked from commit 2529d77179065b983d69c620c7f71281aefe4f98) --- docs/relnotes/17.3.5.html | 65 +++ 1 file changed, 65 insertions(+) diff --git a/docs/relnotes/17.3.5.html b/docs/relnotes/17.3.5.html new file mode 100644 index 00..cf9536bf5b --- /dev/null +++ b/docs/relnotes/17.3.5.html @@ -0,0 +1,65 @@ +http://www.w3.org/TR/html4/loose.dtd";> + + + + Mesa Release Notes + + + + + + The Mesa 3D Graphics Library + + + + + +Mesa 17.3.5 Release Notes / February 19, 2018 + + +Mesa 17.3.5 is a bug fix release which fixes bugs found since the 17.3.4 release. + + +Mesa 17.3.5 implements the OpenGL 4.5 API, but the version reported by +glGetString(GL_VERSION) or glGetIntegerv(GL_MAJOR_VERSION) / +glGetIntegerv(GL_MINOR_VERSION) depends on the particular driver being used. +Some drivers don't support all the features required in OpenGL 4.5. OpenGL +4.5 is only available if requested at context creation +because compatibility contexts are not supported. + + + +SHA256 checksums + +TBD + + + +New features +None + + +Bug fixes + + + + + + +Changes + +Emil Velikov (2): + + docs: add sha256 checksums for 17.3.4 + Update version to 17.3.5 + + +James Legg (1): + + ac/nir: Fix conflict resolution typo in handle_vs_input_decl + + + + + + ___ mesa-commit mailing list mesa-commit@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/mesa-commit
Mesa: tag mesa-17.3.5: mesa-17.3.5
Module: Mesa Branch: refs/tags/mesa-17.3.5 Tag:80702fd89a02bab606c38d81fa93d2c2491eee88 URL: http://cgit.freedesktop.org/mesa/mesa/tag/?id=80702fd89a02bab606c38d81fa93d2c2491eee88 Tagger: Emil Velikov Date: Mon Feb 19 22:05:36 2018 + mesa-17.3.5 ___ mesa-commit mailing list mesa-commit@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/mesa-commit
Mesa (17.3): ac/nir: Fix conflict resolution typo in handle_vs_input_decl
Module: Mesa Branch: 17.3 Commit: de93e457346aafbbfccbee071d6bc13f413ba876 URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=de93e457346aafbbfccbee071d6bc13f413ba876 Author: James Legg Date: Tue Feb 13 16:05:54 2018 + ac/nir: Fix conflict resolution typo in handle_vs_input_decl Fixes ad764e365beb8a119369b97f5cb95fc7ea8c: "ac/nir: Use instance_rate_inputs per attribute, not per variable". CC: CC: Emil Velikov Reviewed-by: Bas Nieuwenhuizen --- src/amd/common/ac_nir_to_llvm.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/amd/common/ac_nir_to_llvm.c b/src/amd/common/ac_nir_to_llvm.c index dde6cbc8f5..4812debb2f 100644 --- a/src/amd/common/ac_nir_to_llvm.c +++ b/src/amd/common/ac_nir_to_llvm.c @@ -5117,7 +5117,7 @@ handle_vs_input_decl(struct nir_to_llvm_context *ctx, variable->data.driver_location = idx * 4; for (unsigned i = 0; i < attrib_count; ++i, ++idx) { - if (ctx->options->key.vs.instance_rate_inputs & (1u << (index + 1))) { + if (ctx->options->key.vs.instance_rate_inputs & (1u << (index + i))) { buffer_index = LLVMBuildAdd(ctx->builder, ctx->abi.instance_id, ctx->abi.start_instance, ""); ctx->shader_info->vs.vgpr_comp_cnt = ___ mesa-commit mailing list mesa-commit@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/mesa-commit
Mesa (17.3): docs: add release notes for 17.3.5
Module: Mesa Branch: 17.3 Commit: 2529d77179065b983d69c620c7f71281aefe4f98 URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=2529d77179065b983d69c620c7f71281aefe4f98 Author: Emil Velikov Date: Mon Feb 19 22:01:35 2018 + docs: add release notes for 17.3.5 Signed-off-by: Emil Velikov --- docs/relnotes/17.3.5.html | 65 +++ 1 file changed, 65 insertions(+) diff --git a/docs/relnotes/17.3.5.html b/docs/relnotes/17.3.5.html new file mode 100644 index 00..cf9536bf5b --- /dev/null +++ b/docs/relnotes/17.3.5.html @@ -0,0 +1,65 @@ +http://www.w3.org/TR/html4/loose.dtd";> + + + + Mesa Release Notes + + + + + + The Mesa 3D Graphics Library + + + + + +Mesa 17.3.5 Release Notes / February 19, 2018 + + +Mesa 17.3.5 is a bug fix release which fixes bugs found since the 17.3.4 release. + + +Mesa 17.3.5 implements the OpenGL 4.5 API, but the version reported by +glGetString(GL_VERSION) or glGetIntegerv(GL_MAJOR_VERSION) / +glGetIntegerv(GL_MINOR_VERSION) depends on the particular driver being used. +Some drivers don't support all the features required in OpenGL 4.5. OpenGL +4.5 is only available if requested at context creation +because compatibility contexts are not supported. + + + +SHA256 checksums + +TBD + + + +New features +None + + +Bug fixes + + + + + + +Changes + +Emil Velikov (2): + + docs: add sha256 checksums for 17.3.4 + Update version to 17.3.5 + + +James Legg (1): + + ac/nir: Fix conflict resolution typo in handle_vs_input_decl + + + + + + ___ mesa-commit mailing list mesa-commit@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/mesa-commit
Mesa (17.3): Update version to 17.3.5
Module: Mesa Branch: 17.3 Commit: ea8ad9af0e9c01faedaceb6cd9ce8cc4edd575be URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=ea8ad9af0e9c01faedaceb6cd9ce8cc4edd575be Author: Emil Velikov Date: Mon Feb 19 21:55:11 2018 + Update version to 17.3.5 Signed-off-by: Emil Velikov --- VERSION | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/VERSION b/VERSION index 4abbb906a1..8cd5aba540 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -17.3.4 +17.3.5 ___ mesa-commit mailing list mesa-commit@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/mesa-commit
Mesa (master): radeonsi: fix regression from 32-bit pointers on CI
Module: Mesa Branch: master Commit: f78fe98fff672b2a40d64d71e28f37f4a2983589 URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=f78fe98fff672b2a40d64d71e28f37f4a2983589 Author: Marek Olšák Date: Mon Feb 19 17:55:34 2018 +0100 radeonsi: fix regression from 32-bit pointers on CI Tested-by: Michel Dänzer --- src/gallium/drivers/radeonsi/si_pipe.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/gallium/drivers/radeonsi/si_pipe.c b/src/gallium/drivers/radeonsi/si_pipe.c index f07ec50ab7..ec543f2c0e 100644 --- a/src/gallium/drivers/radeonsi/si_pipe.c +++ b/src/gallium/drivers/radeonsi/si_pipe.c @@ -357,7 +357,7 @@ static struct pipe_context *si_create_context(struct pipe_screen *screen, if (sctx->b.chip_class == CIK) { sctx->null_const_buf.buffer = si_aligned_buffer_create(screen, - R600_RESOURCE_FLAG_UNMAPPABLE, +R600_RESOURCE_FLAG_32BIT, PIPE_USAGE_DEFAULT, 16, sctx->screen->info.tcc_cache_line_size); if (!sctx->null_const_buf.buffer) ___ mesa-commit mailing list mesa-commit@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/mesa-commit
Mesa (master): radv: compact varyings after removing unused ones
Module: Mesa Branch: master Commit: 549c7f372442ebeeff5c7d3f45920a0bd87795db URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=549c7f372442ebeeff5c7d3f45920a0bd87795db Author: Samuel Pitoiset Date: Fri Feb 16 10:28:37 2018 +0100 radv: compact varyings after removing unused ones It makes no sense to compact before, and the description of nir_compact_varyings() confirms that. Polaris10: Totals from affected shaders: SGPRS: 108528 -> 108128 (-0.37 %) VGPRS: 74548 -> 74500 (-0.06 %) Spilled SGPRs: 844 -> 814 (-3.55 %) Code Size: 3007328 -> 2992932 (-0.48 %) bytes Max Waves: 16019 -> 16009 (-0.06 %) Vega10: Totals from affected shaders: SGPRS: 106088 -> 106232 (0.14 %) VGPRS: 74652 -> 74700 (0.06 %) Spilled SGPRs: 692 -> 658 (-4.91 %) Code Size: 2967708 -> 2953028 (-0.49 %) bytes Max Waves: 18178 -> 18162 (-0.09 %) Signed-off-by: Samuel Pitoiset Reviewed-by: Timothy Arceri --- src/amd/vulkan/radv_pipeline.c | 9 +++-- 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/src/amd/vulkan/radv_pipeline.c b/src/amd/vulkan/radv_pipeline.c index 0d1958fc93..88646fda2f 100644 --- a/src/amd/vulkan/radv_pipeline.c +++ b/src/amd/vulkan/radv_pipeline.c @@ -1524,6 +1524,9 @@ radv_link_shaders(struct radv_pipeline *pipeline, nir_shader **shaders) bool progress = nir_remove_unused_varyings(ordered_shaders[i], ordered_shaders[i - 1]); + nir_compact_varyings(ordered_shaders[i], +ordered_shaders[i - 1], true); + if (progress) { if (nir_lower_global_vars_to_local(ordered_shaders[i])) { radv_lower_indirect_derefs(ordered_shaders[i], @@ -1722,7 +1725,6 @@ void radv_create_shaders(struct radv_pipeline *pipeline, last = i; } - int prev = -1; for (unsigned i = 0; i < MESA_SHADER_STAGES; ++i) { const VkPipelineShaderStageCreateInfo *stage = pStages[i]; @@ -1753,11 +1755,6 @@ void radv_create_shaders(struct radv_pipeline *pipeline, nir_lower_io_to_scalar_early(nir[i], mask); radv_optimize_nir(nir[i]); } - - if (prev != -1) { - nir_compact_varyings(nir[prev], nir[i], true); - } - prev = i; } if (nir[MESA_SHADER_TESS_CTRL]) { ___ mesa-commit mailing list mesa-commit@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/mesa-commit