From 7b7a89638fc91a2d9a86ce82e4c3b0bc4962c69f Mon Sep 17 00:00:00 2001 From: CentOS Sources Date: Tue, 16 Feb 2021 18:10:18 +0000 Subject: [PATCH] import mesa-20.3.3-1.el8 --- .gitignore | 1 + .mesa.metadata | 1 + SOURCES/Makefile | 23 + .../Mesa-MLAA-License-Clarification-Email.txt | 117 ++ SOURCES/anv-remove-warning.patch | 13 + SOURCES/lavapipe-disable-env-var.patch | 13 + SOURCES/mesa-20.3.3-stable-fixes.patch | 930 ++++++++++++ SOURCES/vl_decoder.c | 20 + SOURCES/vl_mpeg12_decoder.c | 7 + SPECS/mesa.spec | 1338 +++++++++++++++++ 10 files changed, 2463 insertions(+) create mode 100644 .gitignore create mode 100644 .mesa.metadata create mode 100644 SOURCES/Makefile create mode 100644 SOURCES/Mesa-MLAA-License-Clarification-Email.txt create mode 100644 SOURCES/anv-remove-warning.patch create mode 100644 SOURCES/lavapipe-disable-env-var.patch create mode 100644 SOURCES/mesa-20.3.3-stable-fixes.patch create mode 100644 SOURCES/vl_decoder.c create mode 100644 SOURCES/vl_mpeg12_decoder.c create mode 100644 SPECS/mesa.spec diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..a4e3e90 --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +SOURCES/mesa-20.3.3.tar.xz diff --git a/.mesa.metadata b/.mesa.metadata new file mode 100644 index 0000000..3d34979 --- /dev/null +++ b/.mesa.metadata @@ -0,0 +1 @@ +c0e42fada2b306a6d9740376398c0d8b0a130427 SOURCES/mesa-20.3.3.tar.xz diff --git a/SOURCES/Makefile b/SOURCES/Makefile new file mode 100644 index 0000000..eea9f33 --- /dev/null +++ b/SOURCES/Makefile @@ -0,0 +1,23 @@ +VERSION ?= 20.3.3 +SANITIZE ?= 1 + +DIRNAME = mesa-${VERSION} + +all: archive + +clean: + rm -rf $(DIRNAME)/ + rm -f mesa-${VERSION}.tar.xz + +clone: clean + curl -O https://archive.mesa3d.org/mesa-${VERSION}.tar.xz + tar xf mesa-${VERSION}.tar.xz + +sanitize: clone vl_mpeg12_decoder.c vl_decoder.c +ifdef SANITIZE + cat < vl_mpeg12_decoder.c > $(DIRNAME)/src/gallium/auxiliary/vl/vl_mpeg12_decoder.c + cat < vl_decoder.c > $(DIRNAME)/src/gallium/auxiliary/vl/vl_decoder.c +endif + +archive: clone sanitize + tar caf ${DIRNAME}.tar.xz ${DIRNAME} diff --git a/SOURCES/Mesa-MLAA-License-Clarification-Email.txt b/SOURCES/Mesa-MLAA-License-Clarification-Email.txt new file mode 100644 index 0000000..30bdf2e --- /dev/null +++ b/SOURCES/Mesa-MLAA-License-Clarification-Email.txt @@ -0,0 +1,117 @@ + +Subject: RE: Question about Mesa MLAA license +From: Jorge Jimenez +Date: 01/08/2013 12:50 PM +To: Tom Callaway +CC: "jorge@iryoku.com" + +Yes to both questions. + +Thanks, +Jorge + +From: Tom Callaway +Sent: January 8, 2013 6:49 PM +To: Jorge Jimenez +CC: jorge@iryoku.com +Subject: Re: Question about Mesa MLAA license + +On 01/08/2013 12:39 PM, Jorge Jimenez wrote: +> Hi Tom, +> +> What we meant with that is that we made an exception for clause 2. +> Instead of clause 2, in the case of the Mesa project, you have to name +> the technique Jimenez's MLAA in the config options of Mesa. We did that +> just to allow them to solve license issues. This exception should be for +> the Mesa project, and any project using Mesa, like Fedora. +> +> We want to widespread usage of our MLAA, so we want to avoid any kind of +> license complications. Hope current one is good for Fedora, if not +> please tell, and we'll see what we can do! + +Okay, a few more questions: + +* If Fedora decides to simply reproduce the quoted statement: +"Uses Jimenez's MLAA. Copyright (C) 2010 by Jorge Jimenez, Belen Masia, +Jose I. Echevarria, Fernando Navarro and Diego Gutierrez." + +Specifically, if this is done as part of documentation included with +Mesa, is that sufficient to meet clause 2 even if the Mesa config option +is not set as described in your exception? + +* Currently, the Mesa config option for MLAA says: "Morphological +anti-aliasing based on Jimenez\' MLAA. 0 to disable, 8 for default +quality". Is this in compliance with your exception? + +Thanks again, + +~tom + +== +Fedora Project + +Subject: RE: Question about Mesa MLAA license +From: Jorge Jimenez +Date: 01/08/2013 12:39 PM +To: "jorge@iryoku.com" , Tom Callaway + +Hi Tom, + +What we meant with that is that we made an exception for clause 2. +Instead of clause 2, in the case of the Mesa project, you have to name +the technique Jimenez's MLAA in the config options of Mesa. We did that +just to allow them to solve license issues. This exception should be for +the Mesa project, and any project using Mesa, like Fedora. + +We want to widespread usage of our MLAA, so we want to avoid any kind of +license complications. Hope current one is good for Fedora, if not +please tell, and we'll see what we can do! + +Cheers, +Jorge + +From: Tom Callaway +Sent: January 8, 2013 6:30 PM +To: jorge@iryoku.com +Subject: Question about Mesa MLAA license + +Jorge, + +Thanks for all of your fantastic graphics work! I have been auditing +Fedora (a popular distribution of Linux) for license compliance and I +came across your MLAA code in Mesa. + +The license says: + + * 2. Redistributions in binary form must reproduce the following +statement: + * + * "Uses Jimenez's MLAA. Copyright (C) 2010 by Jorge Jimenez, Belen Masia, + * Jose I. Echevarria, Fernando Navarro and Diego Gutierrez." + * + * Only for use in the Mesa project, this point 2 is filled by naming the + * technique Jimenez's MLAA in the Mesa config options. + +That wording is unclear. When you say "Only for use in the Mesa +project...", it seems like you could either be saying: + +- This code may only be used as part of Mesa. + +OR + +- In Mesa, you can comply with clause 2 by simply selecting "Jimenez's +MLAA" in the Mesa config options. + +***** + +If the first item is true, then we may have to remove the MLAA code from +Fedora's copy of Mesa. However, looking at the license on your SMAA +code, I do not believe it to be the case. Please let me know either way! + +Thanks in advance, + +Tom Callaway +Fedora Legal + +== +Fedora Project diff --git a/SOURCES/anv-remove-warning.patch b/SOURCES/anv-remove-warning.patch new file mode 100644 index 0000000..130a050 --- /dev/null +++ b/SOURCES/anv-remove-warning.patch @@ -0,0 +1,13 @@ +diff -up mesa-20.3.3/src/intel/vulkan/anv_perf.c.dma mesa-20.3.3/src/intel/vulkan/anv_perf.c +--- mesa-20.3.3/src/intel/vulkan/anv_perf.c.dma 2021-02-16 12:56:09.881084752 +1000 ++++ mesa-20.3.3/src/intel/vulkan/anv_perf.c 2021-02-16 12:56:14.626213956 +1000 +@@ -47,9 +47,6 @@ anv_get_perf(const struct gen_device_inf + gen_perf_init_metrics(perf, devinfo, fd, false /* pipeline statistics */); + + if (!perf->n_queries) { +- if (perf->platform_supported) +- mesa_logw("Performance support disabled, " +- "consider sysctl dev.i915.perf_stream_paranoid=0\n"); + goto err; + } + diff --git a/SOURCES/lavapipe-disable-env-var.patch b/SOURCES/lavapipe-disable-env-var.patch new file mode 100644 index 0000000..9b59577 --- /dev/null +++ b/SOURCES/lavapipe-disable-env-var.patch @@ -0,0 +1,13 @@ +diff -up mesa-20.3.0-rc1/src/gallium/frontends/lavapipe/lvp_device.c.dma mesa-20.3.0-rc1/src/gallium/frontends/lavapipe/lvp_device.c +--- mesa-20.3.0-rc1/src/gallium/frontends/lavapipe/lvp_device.c.dma 2020-11-19 15:11:42.483134826 +1000 ++++ mesa-20.3.0-rc1/src/gallium/frontends/lavapipe/lvp_device.c 2020-11-19 15:13:08.556425782 +1000 +@@ -118,6 +118,9 @@ VkResult lvp_CreateInstance( + client_version = VK_API_VERSION_1_0; + } + ++ if (!getenv("RH_SW_VULKAN")) ++ return VK_ERROR_INITIALIZATION_FAILED; ++ + instance = vk_zalloc2(&default_alloc, pAllocator, sizeof(*instance), 8, + VK_SYSTEM_ALLOCATION_SCOPE_INSTANCE); + if (!instance) diff --git a/SOURCES/mesa-20.3.3-stable-fixes.patch b/SOURCES/mesa-20.3.3-stable-fixes.patch new file mode 100644 index 0000000..231e20b --- /dev/null +++ b/SOURCES/mesa-20.3.3-stable-fixes.patch @@ -0,0 +1,930 @@ +diff --git a/src/amd/vulkan/radv_query.c b/src/amd/vulkan/radv_query.c +index d49bc0f0564..90512d4f276 100644 +--- a/src/amd/vulkan/radv_query.c ++++ b/src/amd/vulkan/radv_query.c +@@ -1679,13 +1679,14 @@ static void emit_begin_query(struct radv_cmd_buffer *cmd_buffer, + + va += 8 * idx; + +- si_cs_emit_write_event_eop(cs, +- cmd_buffer->device->physical_device->rad_info.chip_class, +- radv_cmd_buffer_uses_mec(cmd_buffer), +- V_028A90_PS_DONE, 0, +- EOP_DST_SEL_TC_L2, +- EOP_DATA_SEL_GDS, +- va, EOP_DATA_GDS(0, 1), 0); ++ radeon_emit(cs, PKT3(PKT3_COPY_DATA, 4, 0)); ++ radeon_emit(cs, COPY_DATA_SRC_SEL(COPY_DATA_GDS) | ++ COPY_DATA_DST_SEL(COPY_DATA_DST_MEM) | ++ COPY_DATA_WR_CONFIRM); ++ radeon_emit(cs, 0); ++ radeon_emit(cs, 0); ++ radeon_emit(cs, va); ++ radeon_emit(cs, va >> 32); + + /* Record that the command buffer needs GDS. */ + cmd_buffer->gds_needed = true; +@@ -1769,13 +1770,14 @@ static void emit_end_query(struct radv_cmd_buffer *cmd_buffer, + + va += 8 * idx; + +- si_cs_emit_write_event_eop(cs, +- cmd_buffer->device->physical_device->rad_info.chip_class, +- radv_cmd_buffer_uses_mec(cmd_buffer), +- V_028A90_PS_DONE, 0, +- EOP_DST_SEL_TC_L2, +- EOP_DATA_SEL_GDS, +- va, EOP_DATA_GDS(0, 1), 0); ++ radeon_emit(cs, PKT3(PKT3_COPY_DATA, 4, 0)); ++ radeon_emit(cs, COPY_DATA_SRC_SEL(COPY_DATA_GDS) | ++ COPY_DATA_DST_SEL(COPY_DATA_DST_MEM) | ++ COPY_DATA_WR_CONFIRM); ++ radeon_emit(cs, 0); ++ radeon_emit(cs, 0); ++ radeon_emit(cs, va); ++ radeon_emit(cs, va >> 32); + + cmd_buffer->state.active_pipeline_gds_queries--; + } +diff --git a/src/amd/vulkan/radv_shader.h b/src/amd/vulkan/radv_shader.h +index 9d9491d4361..2eb3ba4e64e 100644 +--- a/src/amd/vulkan/radv_shader.h ++++ b/src/amd/vulkan/radv_shader.h +@@ -573,9 +573,11 @@ get_tcs_num_patches(unsigned tcs_num_input_vertices, + if (chip_class >= GFX7 && family != CHIP_STONEY) + hardware_lds_size = 65536; + +- num_patches = MIN2(num_patches, hardware_lds_size / (input_patch_size + output_patch_size)); ++ if (input_patch_size + output_patch_size) ++ num_patches = MIN2(num_patches, hardware_lds_size / (input_patch_size + output_patch_size)); + /* Make sure the output data fits in the offchip buffer */ +- num_patches = MIN2(num_patches, (tess_offchip_block_dw_size * 4) / output_patch_size); ++ if (output_patch_size) ++ num_patches = MIN2(num_patches, (tess_offchip_block_dw_size * 4) / output_patch_size); + /* Not necessary for correctness, but improves performance. The + * specific value is taken from the proprietary driver. + */ +diff --git a/src/gallium/auxiliary/cso_cache/cso_context.c b/src/gallium/auxiliary/cso_cache/cso_context.c +index 1eef6aac70c..a6a663d97a6 100644 +--- a/src/gallium/auxiliary/cso_cache/cso_context.c ++++ b/src/gallium/auxiliary/cso_cache/cso_context.c +@@ -402,10 +402,13 @@ void cso_destroy_context( struct cso_context *ctx ) + PIPE_SHADER_CAP_MAX_SHADER_BUFFERS); + int maxcb = scr->get_shader_param(scr, sh, + PIPE_SHADER_CAP_MAX_CONST_BUFFERS); ++ int maximg = scr->get_shader_param(scr, sh, ++ PIPE_SHADER_CAP_MAX_SHADER_IMAGES); + assert(maxsam <= PIPE_MAX_SAMPLERS); + assert(maxview <= PIPE_MAX_SHADER_SAMPLER_VIEWS); + assert(maxssbo <= PIPE_MAX_SHADER_BUFFERS); + assert(maxcb <= PIPE_MAX_CONSTANT_BUFFERS); ++ assert(maximg <= PIPE_MAX_SHADER_IMAGES); + if (maxsam > 0) { + ctx->pipe->bind_sampler_states(ctx->pipe, sh, 0, maxsam, zeros); + } +@@ -415,6 +418,9 @@ void cso_destroy_context( struct cso_context *ctx ) + if (maxssbo > 0) { + ctx->pipe->set_shader_buffers(ctx->pipe, sh, 0, maxssbo, ssbos, 0); + } ++ if (maximg > 0) { ++ ctx->pipe->set_shader_images(ctx->pipe, sh, 0, maximg, NULL); ++ } + for (int i = 0; i < maxcb; i++) { + ctx->pipe->set_constant_buffer(ctx->pipe, sh, i, NULL); + } +diff --git a/src/gallium/drivers/iris/iris_program.c b/src/gallium/drivers/iris/iris_program.c +index 8157e921850..971fc80b5ac 100644 +--- a/src/gallium/drivers/iris/iris_program.c ++++ b/src/gallium/drivers/iris/iris_program.c +@@ -2109,8 +2109,8 @@ iris_get_scratch_space(struct iris_context *ice, + * in the base configuration. + */ + unsigned subslice_total = screen->subslice_total; +- if (devinfo->gen >= 12) +- subslice_total = devinfo->num_subslices[0]; ++ if (devinfo->gen == 12) ++ subslice_total = (devinfo->is_dg1 || devinfo->gt == 2 ? 6 : 2); + else if (devinfo->gen == 11) + subslice_total = 8; + else if (devinfo->gen < 11) +diff --git a/src/gallium/drivers/iris/iris_resolve.c b/src/gallium/drivers/iris/iris_resolve.c +index 276ad62b1dd..045f43ed8c0 100644 +--- a/src/gallium/drivers/iris/iris_resolve.c ++++ b/src/gallium/drivers/iris/iris_resolve.c +@@ -793,7 +793,9 @@ iris_resource_set_aux_state(struct iris_context *ice, + if (res->aux.state[level][start_layer + a] != aux_state) { + res->aux.state[level][start_layer + a] = aux_state; + /* XXX: Need to track which bindings to make dirty */ +- ice->state.dirty |= IRIS_DIRTY_RENDER_BUFFER; ++ ice->state.dirty |= IRIS_DIRTY_RENDER_BUFFER | ++ IRIS_DIRTY_RENDER_RESOLVES_AND_FLUSHES | ++ IRIS_DIRTY_COMPUTE_RESOLVES_AND_FLUSHES; + ice->state.stage_dirty |= IRIS_ALL_STAGE_DIRTY_BINDINGS; + } + } +diff --git a/src/gallium/drivers/iris/iris_resource.c b/src/gallium/drivers/iris/iris_resource.c +index 8747ef4aa8a..3b34e32cd21 100644 +--- a/src/gallium/drivers/iris/iris_resource.c ++++ b/src/gallium/drivers/iris/iris_resource.c +@@ -1125,6 +1125,20 @@ iris_flush_resource(struct pipe_context *ctx, struct pipe_resource *resource) + 0, INTEL_REMAINING_LAYERS, + mod ? mod->aux_usage : ISL_AUX_USAGE_NONE, + mod ? mod->supports_clear_color : false); ++ ++ if (!res->mod_info && res->aux.usage != ISL_AUX_USAGE_NONE) { ++ /* flush_resource may be used to prepare an image for sharing external ++ * to the driver (e.g. via eglCreateImage). To account for this, make ++ * sure to get rid of any compression that a consumer wouldn't know how ++ * to handle. ++ */ ++ for (int i = 0; i < IRIS_BATCH_COUNT; i++) { ++ if (iris_batch_references(&ice->batches[i], res->bo)) ++ iris_batch_flush(&ice->batches[i]); ++ } ++ ++ iris_resource_disable_aux(res); ++ } + } + + static void +diff --git a/src/gallium/drivers/iris/iris_state.c b/src/gallium/drivers/iris/iris_state.c +index 59a63f7bbab..b9ddb863a16 100644 +--- a/src/gallium/drivers/iris/iris_state.c ++++ b/src/gallium/drivers/iris/iris_state.c +@@ -1666,6 +1666,8 @@ struct iris_rasterizer_state { + bool multisample; + bool force_persample_interp; + bool conservative_rasterization; ++ bool fill_mode_point; ++ bool fill_mode_line; + bool fill_mode_point_or_line; + enum pipe_sprite_coord_mode sprite_coord_mode; /* PIPE_SPRITE_* */ + uint16_t sprite_coord_enable; +@@ -1729,11 +1731,15 @@ iris_create_rasterizer_state(struct pipe_context *ctx, + cso->conservative_rasterization = + state->conservative_raster_mode == PIPE_CONSERVATIVE_RASTER_POST_SNAP; + +- cso->fill_mode_point_or_line = +- state->fill_front == PIPE_POLYGON_MODE_LINE || ++ cso->fill_mode_point = + state->fill_front == PIPE_POLYGON_MODE_POINT || +- state->fill_back == PIPE_POLYGON_MODE_LINE || + state->fill_back == PIPE_POLYGON_MODE_POINT; ++ cso->fill_mode_line = ++ state->fill_front == PIPE_POLYGON_MODE_LINE || ++ state->fill_back == PIPE_POLYGON_MODE_LINE; ++ cso->fill_mode_point_or_line = ++ cso->fill_mode_point || ++ cso->fill_mode_line; + + if (state->clip_plane_enable != 0) + cso->num_clip_plane_consts = util_logbase2(state->clip_plane_enable) + 1; +@@ -4059,6 +4065,28 @@ iris_emit_sbe_swiz(struct iris_batch *batch, + } + } + ++static bool ++iris_is_drawing_points(const struct iris_context *ice) ++{ ++ const struct iris_rasterizer_state *cso_rast = ice->state.cso_rast; ++ ++ if (cso_rast->fill_mode_point) { ++ return true; ++ } ++ ++ if (ice->shaders.prog[MESA_SHADER_GEOMETRY]) { ++ const struct brw_gs_prog_data *gs_prog_data = ++ (void *) ice->shaders.prog[MESA_SHADER_GEOMETRY]->prog_data; ++ return gs_prog_data->output_topology == _3DPRIM_POINTLIST; ++ } else if (ice->shaders.prog[MESA_SHADER_TESS_EVAL]) { ++ const struct brw_tes_prog_data *tes_data = ++ (void *) ice->shaders.prog[MESA_SHADER_TESS_EVAL]->prog_data; ++ return tes_data->output_topology == BRW_TESS_OUTPUT_TOPOLOGY_POINT; ++ } else { ++ return ice->state.prim_mode == PIPE_PRIM_POINTS; ++ } ++} ++ + static unsigned + iris_calculate_point_sprite_overrides(const struct brw_wm_prog_data *prog_data, + const struct iris_rasterizer_state *cso) +@@ -4093,7 +4121,8 @@ iris_emit_sbe(struct iris_batch *batch, const struct iris_context *ice) + &urb_read_offset, &urb_read_length); + + unsigned sprite_coord_overrides = +- iris_calculate_point_sprite_overrides(wm_prog_data, cso_rast); ++ iris_is_drawing_points(ice) ? ++ iris_calculate_point_sprite_overrides(wm_prog_data, cso_rast) : 0; + + iris_emit_cmd(batch, GENX(3DSTATE_SBE), sbe) { + sbe.AttributeSwizzleEnable = true; +diff --git a/src/gallium/drivers/radeonsi/si_descriptors.c b/src/gallium/drivers/radeonsi/si_descriptors.c +index 8f688fa3650..ef35f86b05f 100644 +--- a/src/gallium/drivers/radeonsi/si_descriptors.c ++++ b/src/gallium/drivers/radeonsi/si_descriptors.c +@@ -1482,11 +1482,12 @@ void si_update_needs_color_decompress_masks(struct si_context *sctx) + /* Reset descriptors of buffer resources after \p buf has been invalidated. + * If buf == NULL, reset all descriptors. + */ +-static void si_reset_buffer_resources(struct si_context *sctx, struct si_buffer_resources *buffers, ++static bool si_reset_buffer_resources(struct si_context *sctx, struct si_buffer_resources *buffers, + unsigned descriptors_idx, uint64_t slot_mask, + struct pipe_resource *buf, enum radeon_bo_priority priority) + { + struct si_descriptors *descs = &sctx->descriptors[descriptors_idx]; ++ bool noop = true; + uint64_t mask = buffers->enabled_mask & slot_mask; + + while (mask) { +@@ -1501,8 +1502,10 @@ static void si_reset_buffer_resources(struct si_context *sctx, struct si_buffer_ + sctx, si_resource(buffer), + buffers->writable_mask & (1llu << i) ? RADEON_USAGE_READWRITE : RADEON_USAGE_READ, + priority, true); ++ noop = false; + } + } ++ return !noop; + } + + /* Update all buffer bindings where the buffer is bound, including +@@ -1577,11 +1580,15 @@ void si_rebind_buffer(struct si_context *sctx, struct pipe_resource *buf) + } + + if (!buffer || buffer->bind_history & PIPE_BIND_SHADER_BUFFER) { +- for (shader = 0; shader < SI_NUM_SHADERS; shader++) +- si_reset_buffer_resources(sctx, &sctx->const_and_shader_buffers[shader], +- si_const_and_shader_buffer_descriptors_idx(shader), +- u_bit_consecutive64(0, SI_NUM_SHADER_BUFFERS), buf, +- sctx->const_and_shader_buffers[shader].priority); ++ for (shader = 0; shader < SI_NUM_SHADERS; shader++) { ++ if (si_reset_buffer_resources(sctx, &sctx->const_and_shader_buffers[shader], ++ si_const_and_shader_buffer_descriptors_idx(shader), ++ u_bit_consecutive64(0, SI_NUM_SHADER_BUFFERS), buf, ++ sctx->const_and_shader_buffers[shader].priority) && ++ shader == PIPE_SHADER_COMPUTE) { ++ sctx->compute_shaderbuf_sgprs_dirty = true; ++ } ++ } + } + + if (!buffer || buffer->bind_history & PIPE_BIND_SAMPLER_VIEW) { +@@ -1633,6 +1640,9 @@ void si_rebind_buffer(struct si_context *sctx, struct pipe_resource *buf) + radeon_add_to_gfx_buffer_list_check_mem(sctx, si_resource(buffer), + RADEON_USAGE_READWRITE, + RADEON_PRIO_SAMPLER_BUFFER, true); ++ ++ if (shader == PIPE_SHADER_COMPUTE) ++ sctx->compute_image_sgprs_dirty = true; + } + } + } +diff --git a/src/gallium/frontends/dri/dri_helpers.c b/src/gallium/frontends/dri/dri_helpers.c +index 01a1fb3d96c..5e87df35a55 100644 +--- a/src/gallium/frontends/dri/dri_helpers.c ++++ b/src/gallium/frontends/dri/dri_helpers.c +@@ -258,7 +258,9 @@ dri2_create_image_from_renderbuffer2(__DRIcontext *context, + int renderbuffer, void *loaderPrivate, + unsigned *error) + { +- struct gl_context *ctx = ((struct st_context *)dri_context(context)->st)->ctx; ++ struct st_context *st_ctx = (struct st_context *)dri_context(context)->st; ++ struct gl_context *ctx = st_ctx->ctx; ++ struct pipe_context *p_ctx = st_ctx->pipe; + struct gl_renderbuffer *rb; + struct pipe_resource *tex; + __DRIimage *img; +@@ -299,6 +301,13 @@ dri2_create_image_from_renderbuffer2(__DRIcontext *context, + + pipe_resource_reference(&img->texture, tex); + ++ /* If the resource supports EGL_MESA_image_dma_buf_export, make sure that ++ * it's in a shareable state. Do this now while we still have the access to ++ * the context. ++ */ ++ if (dri2_get_mapping_by_format(img->dri_format)) ++ p_ctx->flush_resource(p_ctx, tex); ++ + *error = __DRI_IMAGE_ERROR_SUCCESS; + return img; + } +@@ -326,7 +335,9 @@ dri2_create_from_texture(__DRIcontext *context, int target, unsigned texture, + void *loaderPrivate) + { + __DRIimage *img; +- struct gl_context *ctx = ((struct st_context *)dri_context(context)->st)->ctx; ++ struct st_context *st_ctx = (struct st_context *)dri_context(context)->st; ++ struct gl_context *ctx = st_ctx->ctx; ++ struct pipe_context *p_ctx = st_ctx->pipe; + struct gl_texture_object *obj; + struct pipe_resource *tex; + GLuint face = 0; +@@ -376,6 +387,13 @@ dri2_create_from_texture(__DRIcontext *context, int target, unsigned texture, + + pipe_resource_reference(&img->texture, tex); + ++ /* If the resource supports EGL_MESA_image_dma_buf_export, make sure that ++ * it's in a shareable state. Do this now while we still have the access to ++ * the context. ++ */ ++ if (dri2_get_mapping_by_format(img->dri_format)) ++ p_ctx->flush_resource(p_ctx, tex); ++ + *error = __DRI_IMAGE_ERROR_SUCCESS; + return img; + } +@@ -547,6 +565,9 @@ dri2_get_mapping_by_fourcc(int fourcc) + const struct dri2_format_mapping * + dri2_get_mapping_by_format(int format) + { ++ if (format == __DRI_IMAGE_FORMAT_NONE) ++ return NULL; ++ + for (unsigned i = 0; i < ARRAY_SIZE(dri2_format_table); i++) { + if (dri2_format_table[i].dri_format == format) + return &dri2_format_table[i]; +diff --git a/src/gallium/frontends/lavapipe/lvp_device.c b/src/gallium/frontends/lavapipe/lvp_device.c +index 45734f95880..187aecde1f8 100644 +--- a/src/gallium/frontends/lavapipe/lvp_device.c ++++ b/src/gallium/frontends/lavapipe/lvp_device.c +@@ -52,8 +52,6 @@ lvp_physical_device_init(struct lvp_physical_device *device, + if (!device->pscreen) + return vk_error(instance, VK_ERROR_OUT_OF_HOST_MEMORY); + +- fprintf(stderr, "WARNING: lavapipe is not a conformant vulkan implementation, testing use only.\n"); +- + device->max_images = device->pscreen->get_shader_param(device->pscreen, PIPE_SHADER_FRAGMENT, PIPE_SHADER_CAP_MAX_SHADER_IMAGES); + lvp_physical_device_get_supported_extensions(device, &device->supported_extensions); + result = lvp_init_wsi(device); +@@ -575,6 +573,19 @@ void lvp_GetPhysicalDeviceProperties2( + } + } + ++static void lvp_get_physical_device_queue_family_properties( ++ VkQueueFamilyProperties* pQueueFamilyProperties) ++{ ++ *pQueueFamilyProperties = (VkQueueFamilyProperties) { ++ .queueFlags = VK_QUEUE_GRAPHICS_BIT | ++ VK_QUEUE_COMPUTE_BIT | ++ VK_QUEUE_TRANSFER_BIT, ++ .queueCount = 1, ++ .timestampValidBits = 64, ++ .minImageTransferGranularity = (VkExtent3D) { 1, 1, 1 }, ++ }; ++} ++ + void lvp_GetPhysicalDeviceQueueFamilyProperties( + VkPhysicalDevice physicalDevice, + uint32_t* pCount, +@@ -586,15 +597,21 @@ void lvp_GetPhysicalDeviceQueueFamilyProperties( + } + + assert(*pCount >= 1); ++ lvp_get_physical_device_queue_family_properties(pQueueFamilyProperties); ++} + +- *pQueueFamilyProperties = (VkQueueFamilyProperties) { +- .queueFlags = VK_QUEUE_GRAPHICS_BIT | +- VK_QUEUE_COMPUTE_BIT | +- VK_QUEUE_TRANSFER_BIT, +- .queueCount = 1, +- .timestampValidBits = 64, +- .minImageTransferGranularity = (VkExtent3D) { 1, 1, 1 }, +- }; ++void lvp_GetPhysicalDeviceQueueFamilyProperties2( ++ VkPhysicalDevice physicalDevice, ++ uint32_t* pCount, ++ VkQueueFamilyProperties2 *pQueueFamilyProperties) ++{ ++ if (pQueueFamilyProperties == NULL) { ++ *pCount = 1; ++ return; ++ } ++ ++ assert(*pCount >= 1); ++ lvp_get_physical_device_queue_family_properties(&pQueueFamilyProperties->queueFamilyProperties); + } + + void lvp_GetPhysicalDeviceMemoryProperties( +@@ -617,6 +634,14 @@ void lvp_GetPhysicalDeviceMemoryProperties( + }; + } + ++void lvp_GetPhysicalDeviceMemoryProperties2( ++ VkPhysicalDevice physicalDevice, ++ VkPhysicalDeviceMemoryProperties2 *pMemoryProperties) ++{ ++ lvp_GetPhysicalDeviceMemoryProperties(physicalDevice, ++ &pMemoryProperties->memoryProperties); ++} ++ + PFN_vkVoidFunction lvp_GetInstanceProcAddr( + VkInstance _instance, + const char* pName) +@@ -822,6 +847,8 @@ VkResult lvp_CreateDevice( + const VkAllocationCallbacks* pAllocator, + VkDevice* pDevice) + { ++ fprintf(stderr, "WARNING: lavapipe is not a conformant vulkan implementation, testing use only.\n"); ++ + LVP_FROM_HANDLE(lvp_physical_device, physical_device, physicalDevice); + struct lvp_device *device; + +diff --git a/src/glx/g_glxglvnddispatchfuncs.c b/src/glx/g_glxglvnddispatchfuncs.c +index 0f02ed2d321..e0ea27c0b18 100644 +--- a/src/glx/g_glxglvnddispatchfuncs.c ++++ b/src/glx/g_glxglvnddispatchfuncs.c +@@ -87,6 +87,7 @@ const char * const __glXDispatchTableStrings[DI_LAST_INDEX] = { + __ATTRIB(SelectEventSGIX), + // glXSwapBuffers implemented by libglvnd + __ATTRIB(SwapBuffersMscOML), ++ __ATTRIB(SwapIntervalEXT), + __ATTRIB(SwapIntervalMESA), + __ATTRIB(SwapIntervalSGI), + // glXUseXFont implemented by libglvnd +@@ -893,6 +894,24 @@ static int dispatch_SwapIntervalMESA(unsigned int interval) + + + ++static void dispatch_SwapIntervalEXT(Display *dpy, GLXDrawable drawable, int interval) ++{ ++ PFNGLXSWAPINTERVALEXTPROC pSwapIntervalEXT; ++ __GLXvendorInfo *dd; ++ ++ dd = GetDispatchFromDrawable(dpy, drawable); ++ if (dd == NULL) ++ return; ++ ++ __FETCH_FUNCTION_PTR(SwapIntervalEXT); ++ if (pSwapIntervalEXT == NULL) ++ return; ++ ++ pSwapIntervalEXT(dpy, drawable, interval); ++} ++ ++ ++ + static Bool dispatch_WaitForMscOML(Display *dpy, GLXDrawable drawable, + int64_t target_msc, int64_t divisor, + int64_t remainder, int64_t *ust, +@@ -974,6 +993,7 @@ const void * const __glXDispatchFunctions[DI_LAST_INDEX + 1] = { + __ATTRIB(ReleaseTexImageEXT), + __ATTRIB(SelectEventSGIX), + __ATTRIB(SwapBuffersMscOML), ++ __ATTRIB(SwapIntervalEXT), + __ATTRIB(SwapIntervalMESA), + __ATTRIB(SwapIntervalSGI), + __ATTRIB(WaitForMscOML), +diff --git a/src/glx/g_glxglvnddispatchindices.h b/src/glx/g_glxglvnddispatchindices.h +index 3ba50a74abb..b65d078098f 100644 +--- a/src/glx/g_glxglvnddispatchindices.h ++++ b/src/glx/g_glxglvnddispatchindices.h +@@ -79,6 +79,7 @@ typedef enum __GLXdispatchIndex { + DI_SelectEventSGIX, + // SwapBuffers implemented by libglvnd + DI_SwapBuffersMscOML, ++ DI_SwapIntervalEXT, + DI_SwapIntervalMESA, + DI_SwapIntervalSGI, + // UseXFont implemented by libglvnd +diff --git a/src/intel/common/gen_mi_builder.h b/src/intel/common/gen_mi_builder.h +index ddd8459ef07..47fb98e99f7 100644 +--- a/src/intel/common/gen_mi_builder.h ++++ b/src/intel/common/gen_mi_builder.h +@@ -932,6 +932,13 @@ gen_mi_store_address(struct gen_mi_builder *b, + static inline void + gen_mi_self_mod_barrier(struct gen_mi_builder *b) + { ++ /* First make sure all the memory writes from previous modifying commands ++ * have landed. We want to do this before going through the CS cache, ++ * otherwise we could be fetching memory that hasn't been written to yet. ++ */ ++ gen_mi_builder_emit(b, GENX(PIPE_CONTROL), pc) { ++ pc.CommandStreamerStallEnable = true; ++ } + /* Documentation says Gen11+ should be able to invalidate the command cache + * but experiment show it doesn't work properly, so for now just get over + * the CS prefetch. +diff --git a/src/intel/compiler/brw_fs_copy_propagation.cpp b/src/intel/compiler/brw_fs_copy_propagation.cpp +index 917c3abfe9e..6896987055f 100644 +--- a/src/intel/compiler/brw_fs_copy_propagation.cpp ++++ b/src/intel/compiler/brw_fs_copy_propagation.cpp +@@ -437,6 +437,7 @@ instruction_requires_packed_data(fs_inst *inst) + case FS_OPCODE_DDX_COARSE: + case FS_OPCODE_DDY_FINE: + case FS_OPCODE_DDY_COARSE: ++ case SHADER_OPCODE_QUAD_SWIZZLE: + return true; + default: + return false; +diff --git a/src/intel/compiler/brw_ir_fs.h b/src/intel/compiler/brw_ir_fs.h +index 6ba3a6ca97e..3a4acc1834a 100644 +--- a/src/intel/compiler/brw_ir_fs.h ++++ b/src/intel/compiler/brw_ir_fs.h +@@ -451,13 +451,15 @@ regs_written(const fs_inst *inst) + * Return the number of dataflow registers read by the instruction (either + * fully or partially) counted from 'floor(reg_offset(inst->src[i]) / + * register_size)'. The somewhat arbitrary register size unit is 4B for the +- * UNIFORM and IMM files and 32B for all other files. ++ * UNIFORM files and 32B for all other files. + */ + inline unsigned + regs_read(const fs_inst *inst, unsigned i) + { +- const unsigned reg_size = +- inst->src[i].file == UNIFORM || inst->src[i].file == IMM ? 4 : REG_SIZE; ++ if (inst->src[i].file == IMM) ++ return 1; ++ ++ const unsigned reg_size = inst->src[i].file == UNIFORM ? 4 : REG_SIZE; + return DIV_ROUND_UP(reg_offset(inst->src[i]) % reg_size + + inst->size_read(i) - + MIN2(inst->size_read(i), reg_padding(inst->src[i])), +diff --git a/src/intel/vulkan/anv_allocator.c b/src/intel/vulkan/anv_allocator.c +index 9007cd00e85..48811912e95 100644 +--- a/src/intel/vulkan/anv_allocator.c ++++ b/src/intel/vulkan/anv_allocator.c +@@ -1447,8 +1447,8 @@ anv_scratch_pool_alloc(struct anv_device *device, struct anv_scratch_pool *pool, + * For, Gen11+, scratch space allocation is based on the number of threads + * in the base configuration. + */ +- if (devinfo->gen >= 12) +- subslices = devinfo->num_subslices[0]; ++ if (devinfo->gen == 12) ++ subslices = (devinfo->is_dg1 || devinfo->gt == 2 ? 6 : 2); + else if (devinfo->gen == 11) + subslices = 8; + else if (devinfo->gen >= 9) +diff --git a/src/intel/vulkan/anv_image.c b/src/intel/vulkan/anv_image.c +index 0290431f145..80307cd612f 100644 +--- a/src/intel/vulkan/anv_image.c ++++ b/src/intel/vulkan/anv_image.c +@@ -684,6 +684,25 @@ choose_drm_format_mod(const struct anv_physical_device *device, + return NULL; + } + ++static VkImageUsageFlags ++anv_image_create_usage(const VkImageCreateInfo *pCreateInfo, ++ VkImageUsageFlags usage) ++{ ++ /* Add TRANSFER_SRC usage for multisample attachment images. This is ++ * because we might internally use the TRANSFER_SRC layout on them for ++ * blorp operations associated with resolving those into other attachments ++ * at the end of a subpass. ++ * ++ * Without this additional usage, we compute an incorrect AUX state in ++ * anv_layout_to_aux_state(). ++ */ ++ if (pCreateInfo->samples > VK_SAMPLE_COUNT_1_BIT && ++ (usage & (VK_IMAGE_USAGE_COLOR_ATTACHMENT_BIT | ++ VK_IMAGE_USAGE_DEPTH_STENCIL_ATTACHMENT_BIT))) ++ usage |= VK_IMAGE_USAGE_TRANSFER_SRC_BIT; ++ return usage; ++} ++ + VkResult + anv_image_create(VkDevice _device, + const struct anv_image_create_info *create_info, +@@ -732,7 +751,7 @@ anv_image_create(VkDevice _device, + image->levels = pCreateInfo->mipLevels; + image->array_size = pCreateInfo->arrayLayers; + image->samples = pCreateInfo->samples; +- image->usage = pCreateInfo->usage; ++ image->usage = anv_image_create_usage(pCreateInfo, pCreateInfo->usage); + image->create_flags = pCreateInfo->flags; + image->tiling = pCreateInfo->tiling; + image->disjoint = pCreateInfo->flags & VK_IMAGE_CREATE_DISJOINT_BIT; +@@ -745,8 +764,11 @@ anv_image_create(VkDevice _device, + const VkImageStencilUsageCreateInfoEXT *stencil_usage_info = + vk_find_struct_const(pCreateInfo->pNext, + IMAGE_STENCIL_USAGE_CREATE_INFO_EXT); +- if (stencil_usage_info) +- image->stencil_usage = stencil_usage_info->stencilUsage; ++ if (stencil_usage_info) { ++ image->stencil_usage = ++ anv_image_create_usage(pCreateInfo, ++ stencil_usage_info->stencilUsage); ++ } + } + + /* In case of external format, We don't know format yet, +diff --git a/src/intel/vulkan/anv_pass.c b/src/intel/vulkan/anv_pass.c +index af23b87969d..1818f6c587b 100644 +--- a/src/intel/vulkan/anv_pass.c ++++ b/src/intel/vulkan/anv_pass.c +@@ -23,6 +23,7 @@ + + #include "anv_private.h" + ++#include "vk_format_info.h" + #include "vk_util.h" + + static void +@@ -406,6 +407,70 @@ num_subpass_attachments2(const VkSubpassDescription2KHR *desc) + (ds_resolve && ds_resolve->pDepthStencilResolveAttachment); + } + ++static bool ++vk_image_layout_depth_only(VkImageLayout layout) ++{ ++ switch (layout) { ++ case VK_IMAGE_LAYOUT_DEPTH_READ_ONLY_OPTIMAL: ++ case VK_IMAGE_LAYOUT_DEPTH_ATTACHMENT_OPTIMAL: ++ return true; ++ ++ default: ++ return false; ++ } ++} ++ ++/* From the Vulkan Specification 1.2.166 - VkAttachmentReference2: ++ * ++ * "If layout only specifies the layout of the depth aspect of the ++ * attachment, the layout of the stencil aspect is specified by the ++ * stencilLayout member of a VkAttachmentReferenceStencilLayout structure ++ * included in the pNext chain. Otherwise, layout describes the layout for ++ * all relevant image aspects." ++ */ ++static VkImageLayout ++stencil_ref_layout(const VkAttachmentReference2KHR *att_ref) ++{ ++ if (!vk_image_layout_depth_only(att_ref->layout)) ++ return att_ref->layout; ++ ++ const VkAttachmentReferenceStencilLayoutKHR *stencil_ref = ++ vk_find_struct_const(att_ref->pNext, ++ ATTACHMENT_REFERENCE_STENCIL_LAYOUT_KHR); ++ if (!stencil_ref) ++ return VK_IMAGE_LAYOUT_UNDEFINED; ++ return stencil_ref->stencilLayout; ++} ++ ++/* From the Vulkan Specification 1.2.166 - VkAttachmentDescription2: ++ * ++ * "If format is a depth/stencil format, and initialLayout only specifies ++ * the initial layout of the depth aspect of the attachment, the initial ++ * layout of the stencil aspect is specified by the stencilInitialLayout ++ * member of a VkAttachmentDescriptionStencilLayout structure included in ++ * the pNext chain. Otherwise, initialLayout describes the initial layout ++ * for all relevant image aspects." ++ */ ++static VkImageLayout ++stencil_desc_layout(const VkAttachmentDescription2KHR *att_desc, bool final) ++{ ++ if (!vk_format_has_stencil(att_desc->format)) ++ return VK_IMAGE_LAYOUT_UNDEFINED; ++ ++ const VkImageLayout main_layout = ++ final ? att_desc->finalLayout : att_desc->initialLayout; ++ if (!vk_image_layout_depth_only(main_layout)) ++ return main_layout; ++ ++ const VkAttachmentDescriptionStencilLayoutKHR *stencil_desc = ++ vk_find_struct_const(att_desc->pNext, ++ ATTACHMENT_DESCRIPTION_STENCIL_LAYOUT_KHR); ++ assert(stencil_desc); ++ return final ? ++ stencil_desc->stencilFinalLayout : ++ stencil_desc->stencilInitialLayout; ++} ++ + VkResult anv_CreateRenderPass2( + VkDevice _device, + const VkRenderPassCreateInfo2KHR* pCreateInfo, +@@ -450,10 +515,6 @@ VkResult anv_CreateRenderPass2( + pass->subpass_flushes = subpass_flushes; + + for (uint32_t i = 0; i < pCreateInfo->attachmentCount; i++) { +- const VkAttachmentDescriptionStencilLayoutKHR *stencil_layout = +- vk_find_struct_const(pCreateInfo->pAttachments[i].pNext, +- ATTACHMENT_DESCRIPTION_STENCIL_LAYOUT_KHR); +- + pass->attachments[i] = (struct anv_render_pass_attachment) { + .format = pCreateInfo->pAttachments[i].format, + .samples = pCreateInfo->pAttachments[i].samples, +@@ -463,12 +524,10 @@ VkResult anv_CreateRenderPass2( + .initial_layout = pCreateInfo->pAttachments[i].initialLayout, + .final_layout = pCreateInfo->pAttachments[i].finalLayout, + +- .stencil_initial_layout = (stencil_layout ? +- stencil_layout->stencilInitialLayout : +- pCreateInfo->pAttachments[i].initialLayout), +- .stencil_final_layout = (stencil_layout ? +- stencil_layout->stencilFinalLayout : +- pCreateInfo->pAttachments[i].finalLayout), ++ .stencil_initial_layout = stencil_desc_layout(&pCreateInfo->pAttachments[i], ++ false), ++ .stencil_final_layout = stencil_desc_layout(&pCreateInfo->pAttachments[i], ++ true), + }; + } + +@@ -487,17 +546,11 @@ VkResult anv_CreateRenderPass2( + subpass_attachments += desc->inputAttachmentCount; + + for (uint32_t j = 0; j < desc->inputAttachmentCount; j++) { +- const VkAttachmentReferenceStencilLayoutKHR *stencil_layout = +- vk_find_struct_const(desc->pInputAttachments[j].pNext, +- ATTACHMENT_REFERENCE_STENCIL_LAYOUT_KHR); +- + subpass->input_attachments[j] = (struct anv_subpass_attachment) { + .usage = VK_IMAGE_USAGE_INPUT_ATTACHMENT_BIT, + .attachment = desc->pInputAttachments[j].attachment, + .layout = desc->pInputAttachments[j].layout, +- .stencil_layout = (stencil_layout ? +- stencil_layout->stencilLayout : +- desc->pInputAttachments[j].layout), ++ .stencil_layout = stencil_ref_layout(&desc->pInputAttachments[j]), + }; + } + } +@@ -531,17 +584,11 @@ VkResult anv_CreateRenderPass2( + if (desc->pDepthStencilAttachment) { + subpass->depth_stencil_attachment = subpass_attachments++; + +- const VkAttachmentReferenceStencilLayoutKHR *stencil_attachment = +- vk_find_struct_const(desc->pDepthStencilAttachment->pNext, +- ATTACHMENT_REFERENCE_STENCIL_LAYOUT_KHR); +- + *subpass->depth_stencil_attachment = (struct anv_subpass_attachment) { + .usage = VK_IMAGE_USAGE_DEPTH_STENCIL_ATTACHMENT_BIT, + .attachment = desc->pDepthStencilAttachment->attachment, + .layout = desc->pDepthStencilAttachment->layout, +- .stencil_layout = stencil_attachment ? +- stencil_attachment->stencilLayout : +- desc->pDepthStencilAttachment->layout, ++ .stencil_layout = stencil_ref_layout(desc->pDepthStencilAttachment), + }; + } + +@@ -552,17 +599,11 @@ VkResult anv_CreateRenderPass2( + if (ds_resolve && ds_resolve->pDepthStencilResolveAttachment) { + subpass->ds_resolve_attachment = subpass_attachments++; + +- const VkAttachmentReferenceStencilLayoutKHR *stencil_resolve_attachment = +- vk_find_struct_const(ds_resolve->pDepthStencilResolveAttachment->pNext, +- ATTACHMENT_REFERENCE_STENCIL_LAYOUT_KHR); +- + *subpass->ds_resolve_attachment = (struct anv_subpass_attachment) { + .usage = VK_IMAGE_USAGE_TRANSFER_DST_BIT, + .attachment = ds_resolve->pDepthStencilResolveAttachment->attachment, + .layout = ds_resolve->pDepthStencilResolveAttachment->layout, +- .stencil_layout = stencil_resolve_attachment ? +- stencil_resolve_attachment->stencilLayout : +- ds_resolve->pDepthStencilResolveAttachment->layout, ++ .stencil_layout = stencil_ref_layout(ds_resolve->pDepthStencilResolveAttachment), + }; + subpass->depth_resolve_mode = ds_resolve->depthResolveMode; + subpass->stencil_resolve_mode = ds_resolve->stencilResolveMode; +diff --git a/src/intel/vulkan/genX_cmd_buffer.c b/src/intel/vulkan/genX_cmd_buffer.c +index a9c49e0f592..e3eb376fa5a 100644 +--- a/src/intel/vulkan/genX_cmd_buffer.c ++++ b/src/intel/vulkan/genX_cmd_buffer.c +@@ -462,8 +462,10 @@ anv_image_init_aux_tt(struct anv_cmd_buffer *cmd_buffer, + { + uint32_t plane = anv_image_aspect_to_plane(image->aspects, aspect); + ++ const struct anv_surface *surface = &image->planes[plane].surface; + uint64_t base_address = +- anv_address_physical(image->planes[plane].address); ++ anv_address_physical(anv_address_add(image->planes[plane].address, ++ surface->offset)); + + const struct isl_surf *isl_surf = &image->planes[plane].surface.isl; + uint64_t format_bits = gen_aux_map_format_bits_for_isl_surf(isl_surf); +@@ -1231,6 +1233,17 @@ transition_color_buffer(struct anv_cmd_buffer *cmd_buffer, + uint32_t level_layer_count = + MIN2(layer_count, aux_layers - base_layer); + ++ /* If will_full_fast_clear is set, the caller promises to ++ * fast-clear the largest portion of the specified range as it can. ++ * For color images, that means only the first LOD and array slice. ++ */ ++ if (level == 0 && base_layer == 0 && will_full_fast_clear) { ++ base_layer++; ++ level_layer_count--; ++ if (level_layer_count == 0) ++ continue; ++ } ++ + anv_image_ccs_op(cmd_buffer, image, + image->planes[plane].surface.isl.format, + ISL_SWIZZLE_IDENTITY, +@@ -1250,6 +1263,12 @@ transition_color_buffer(struct anv_cmd_buffer *cmd_buffer, + "define an MCS buffer."); + } + ++ /* If will_full_fast_clear is set, the caller promises to fast-clear ++ * the largest portion of the specified range as it can. ++ */ ++ if (will_full_fast_clear) ++ return; ++ + assert(base_level == 0 && level_count == 1); + anv_image_mcs_op(cmd_buffer, image, + image->planes[plane].surface.isl.format, +diff --git a/src/intel/vulkan/genX_pipeline.c b/src/intel/vulkan/genX_pipeline.c +index 205e8677f19..33f071019b7 100644 +--- a/src/intel/vulkan/genX_pipeline.c ++++ b/src/intel/vulkan/genX_pipeline.c +@@ -1180,7 +1180,22 @@ emit_cb_state(struct anv_graphics_pipeline *pipeline, + #endif + .LogicOpEnable = info->logicOpEnable, + .LogicOpFunction = vk_to_gen_logic_op[info->logicOp], +- .ColorBufferBlendEnable = a->blendEnable, ++ /* Vulkan specification 1.2.168, VkLogicOp: ++ * ++ * "Logical operations are controlled by the logicOpEnable and ++ * logicOp members of VkPipelineColorBlendStateCreateInfo. If ++ * logicOpEnable is VK_TRUE, then a logical operation selected by ++ * logicOp is applied between each color attachment and the ++ * fragment’s corresponding output value, and blending of all ++ * attachments is treated as if it were disabled." ++ * ++ * From the Broadwell PRM Volume 2d: Command Reference: Structures: ++ * BLEND_STATE_ENTRY: ++ * ++ * "Enabling LogicOp and Color Buffer Blending at the same time is ++ * UNDEFINED" ++ */ ++ .ColorBufferBlendEnable = !info->logicOpEnable && a->blendEnable, + .ColorClampRange = COLORCLAMP_RTFORMAT, + .PreBlendColorClampEnable = true, + .PostBlendColorClampEnable = true, +diff --git a/src/intel/vulkan/vk_format_info.h b/src/intel/vulkan/vk_format_info.h +index 006e1f4a6ad..4e72c244742 100644 +--- a/src/intel/vulkan/vk_format_info.h ++++ b/src/intel/vulkan/vk_format_info.h +@@ -164,4 +164,11 @@ vk_format_has_depth(VkFormat format) + return aspects & VK_IMAGE_ASPECT_DEPTH_BIT; + } + ++static inline bool ++vk_format_has_stencil(VkFormat format) ++{ ++ const VkImageAspectFlags aspects = vk_format_aspects(format); ++ return aspects & VK_IMAGE_ASPECT_STENCIL_BIT; ++} ++ + #endif /* VK_FORMAT_INFO_H */ +diff --git a/src/mesa/state_tracker/st_pbo.c b/src/mesa/state_tracker/st_pbo.c +index 65a1ce8862a..b03921c1be6 100644 +--- a/src/mesa/state_tracker/st_pbo.c ++++ b/src/mesa/state_tracker/st_pbo.c +@@ -431,16 +431,21 @@ create_fs(struct st_context *st, bool download, + nir_ssa_def *coord = nir_load_var(&b, fragcoord); + + nir_ssa_def *layer = NULL; +- if (st->pbo.layers && need_layer && (!download || target == PIPE_TEXTURE_1D_ARRAY || +- target == PIPE_TEXTURE_2D_ARRAY || +- target == PIPE_TEXTURE_3D || +- target == PIPE_TEXTURE_CUBE || +- target == PIPE_TEXTURE_CUBE_ARRAY)) { +- nir_variable *var = nir_variable_create(b.shader, nir_var_shader_in, +- glsl_int_type(), "gl_Layer"); +- var->data.location = VARYING_SLOT_LAYER; +- var->data.interpolation = INTERP_MODE_FLAT; +- layer = nir_load_var(&b, var); ++ if (st->pbo.layers && (!download || target == PIPE_TEXTURE_1D_ARRAY || ++ target == PIPE_TEXTURE_2D_ARRAY || ++ target == PIPE_TEXTURE_3D || ++ target == PIPE_TEXTURE_CUBE || ++ target == PIPE_TEXTURE_CUBE_ARRAY)) { ++ if (need_layer) { ++ nir_variable *var = nir_variable_create(b.shader, nir_var_shader_in, ++ glsl_int_type(), "gl_Layer"); ++ var->data.location = VARYING_SLOT_LAYER; ++ var->data.interpolation = INTERP_MODE_FLAT; ++ layer = nir_load_var(&b, var); ++ } ++ else { ++ layer = zero; ++ } + } + + /* offset_pos = param.xy + f2i(coord.xy) */ +diff --git a/src/util/format/u_format.csv b/src/util/format/u_format.csv +index 8acfb869bdb..237c4c95475 100644 +--- a/src/util/format/u_format.csv ++++ b/src/util/format/u_format.csv +@@ -500,7 +500,7 @@ PIPE_FORMAT_R4G4B4A4_UINT , plain, 1, 1, 1, up4 , up4 , up4 , up4 , xy + PIPE_FORMAT_B4G4R4A4_UINT , plain, 1, 1, 1, up4 , up4 , up4 , up4 , zyxw, rgb, up4 , up4 , up4 , up4 , yzwx + PIPE_FORMAT_A4R4G4B4_UINT , plain, 1, 1, 1, up4 , up4 , up4 , up4 , yzwx, rgb, up4 , up4 , up4 , up4 , zyxw + PIPE_FORMAT_A4B4G4R4_UINT , plain, 1, 1, 1, up4 , up4 , up4 , up4 , wzyx, rgb, up4 , up4 , up4 , up4 , xyzw +-PIPE_FORMAT_A1R5G5B5_UINT , plain, 1, 1, 1, up1 , up5 , up5 , up5 , wzyx, rgb, up5 , up5 , up5 , up1 , zyxw ++PIPE_FORMAT_A1R5G5B5_UINT , plain, 1, 1, 1, up1 , up5 , up5 , up5 , yzwx, rgb, up5 , up5 , up5 , up1 , zyxw + PIPE_FORMAT_A1B5G5R5_UINT , plain, 1, 1, 1, up1 , up5 , up5 , up5 , wzyx, rgb, up5 , up5 , up5 , up1 , xyzw + PIPE_FORMAT_R5G5B5A1_UINT , plain, 1, 1, 1, up5 , up5 , up5 , up1 , xyzw, rgb, up5 , up5 , up5 , up1 , wzyx + PIPE_FORMAT_B5G5R5A1_UINT , plain, 1, 1, 1, up5 , up5 , up5 , up1 , zyxw, rgb, up1 , up5 , up5 , up5 , yzwx +diff --git a/src/vulkan/device-select-layer/VkLayer_MESA_device_select.json b/src/vulkan/device-select-layer/VkLayer_MESA_device_select.json +index 1d5fffd0135..361ae9fe74e 100644 +--- a/src/vulkan/device-select-layer/VkLayer_MESA_device_select.json ++++ b/src/vulkan/device-select-layer/VkLayer_MESA_device_select.json +@@ -4,7 +4,7 @@ + "name": "VK_LAYER_MESA_device_select", + "type": "GLOBAL", + "library_path": "libVkLayer_MESA_device_select.so", +- "api_version": "1.1.73", ++ "api_version": "1.2.73", + "implementation_version": "1", + "description": "Linux device selection layer", + "functions": { diff --git a/SOURCES/vl_decoder.c b/SOURCES/vl_decoder.c new file mode 100644 index 0000000..1e715b6 --- /dev/null +++ b/SOURCES/vl_decoder.c @@ -0,0 +1,20 @@ +#include "vl_decoder.h" +bool +vl_profile_supported(struct pipe_screen *screen, enum pipe_video_profile profile, + enum pipe_video_entrypoint entrypoint) +{ + return false; +} + +int +vl_level_supported(struct pipe_screen *screen, enum pipe_video_profile profile) +{ + return 0; +} + +struct pipe_video_codec * +vl_create_decoder(struct pipe_context *pipe, + const struct pipe_video_codec *templat) +{ + return NULL; +} diff --git a/SOURCES/vl_mpeg12_decoder.c b/SOURCES/vl_mpeg12_decoder.c new file mode 100644 index 0000000..85ac2c9 --- /dev/null +++ b/SOURCES/vl_mpeg12_decoder.c @@ -0,0 +1,7 @@ +#include "vl_mpeg12_decoder.h" +struct pipe_video_codec * +vl_create_mpeg12_decoder(struct pipe_context *context, + const struct pipe_video_codec *templat) +{ + return NULL; +} diff --git a/SPECS/mesa.spec b/SPECS/mesa.spec new file mode 100644 index 0000000..694bfef --- /dev/null +++ b/SPECS/mesa.spec @@ -0,0 +1,1338 @@ +%global llvm_toolset %{nil} +%global llvm_pkg_prefix %{nil} + +%ifarch s390x +%define with_hardware 0 +%else +%define with_hardware 1 +%define with_vdpau 1 +%endif + +%ifarch %{ix86} x86_64 +%define platform_drivers i965 +%define with_vmware 1 +%define with_xa 1 +%define with_iris 1 +%endif + +%ifarch %{ix86} x86_64 +%define with_vulkan_hw 1 +%else +%define with_vulkan_hw 0 +%endif + +%ifarch %{arm} aarch64 +%define with_xa 1 +%endif + +%ifnarch %{x86} +%global with_asm 1 +%endif + +%global dri_drivers %{?platform_drivers} + +%if 0%{?with_vulkan_hw} +%define vulkan_drivers swrast,intel,amd +%else +%define vulkan_drivers swrast +%endif + +%global sanitize 0 + +#global rctag rc2 + +Name: mesa +Summary: Mesa graphics libraries +Version: 20.3.3 +Release: 1%{?rctag:.%{rctag}}%{?dist} + +License: MIT +URL: http://www.mesa3d.org +#Source0: https://mesa.freedesktop.org/archive/%{name}-%{version}%{?rctag:-%{rctag}}.tar.xz +Source0: %{name}-%{version}%{?rctag:-%{rctag}}.tar.xz +Source1: vl_decoder.c +Source2: vl_mpeg12_decoder.c +Source3: Makefile +# src/gallium/auxiliary/postprocess/pp_mlaa* have an ... interestingly worded license. +# Source4 contains email correspondence clarifying the license terms. +# Fedora opts to ignore the optional part of clause 2 and treat that code as 2 clause BSD. +Source4: Mesa-MLAA-License-Clarification-Email.txt + +Patch0: lavapipe-disable-env-var.patch +Patch1: mesa-20.3.3-stable-fixes.patch +Patch2: anv-remove-warning.patch + +BuildRequires: gcc +BuildRequires: gcc-c++ + +BuildRequires: meson >= 0.45 +%if %{with_hardware} +BuildRequires: kernel-headers +%endif +BuildRequires: libdrm-devel >= 2.4.103 +BuildRequires: libXxf86vm-devel +BuildRequires: expat-devel +BuildRequires: xorg-x11-proto-devel +BuildRequires: libselinux-devel +BuildRequires: libXext-devel +BuildRequires: libXfixes-devel +BuildRequires: libXdamage-devel +BuildRequires: libXi-devel +BuildRequires: libXrandr-devel +BuildRequires: libXmu-devel +BuildRequires: libxshmfence-devel +BuildRequires: elfutils +BuildRequires: python3-devel +BuildRequires: gettext +BuildRequires: %{llvm_pkg_prefix}llvm-devel >= 3.4-7 +%if 0%{?with_opencl} +BuildRequires: %{llvm_pkg_prefix}clang-devel >= 3.0 +%endif +BuildRequires: elfutils-libelf-devel +BuildRequires: libudev-devel +BuildRequires: bison flex +BuildRequires: pkgconfig(wayland-client) +BuildRequires: pkgconfig(wayland-server) +BuildRequires: pkgconfig(wayland-protocols) +%if 0%{?with_vdpau} +BuildRequires: libvdpau-devel +%endif +%if 0%{?with_vaapi} +BuildRequires: libva-devel +%endif +BuildRequires: pkgconfig(zlib) +%if 0%{?with_omx} +BuildRequires: libomxil-bellagio-devel +%endif +%if 0%{?with_opencl} +BuildRequires: libclc-devel opencl-filesystem +%endif +BuildRequires: python3-mako +%ifarch %{valgrind_arches} +BuildRequires: pkgconfig(valgrind) +%endif +BuildRequires: pkgconfig(libglvnd) >= 1.2.0 + +%if 0%{?rhel} == 7 +BuildRequires: llvm-toolset-7-runtime +%enable_llvmtoolset7 +%endif + + +%description +%{summary}. + +%package filesystem +Summary: Mesa driver filesystem +Provides: mesa-dri-filesystem = %{?epoch:%{epoch}:}%{version}-%{release} +Obsoletes: mesa-dri-filesystem < %{?epoch:%{epoch}:}%{version}-%{release} + +%description filesystem +%{summary}. + +%package libGL +Summary: Mesa libGL runtime libraries +Requires: %{name}-libglapi%{?_isa} = %{?epoch:%{epoch}:}%{version}-%{release} +Requires: libglvnd-glx%{?_isa} >= 1:1.2.0-1 + +%description libGL +%{summary}. + +%package libGL-devel +Summary: Mesa libGL development package +Requires: %{name}-libGL%{?_isa} = %{?epoch:%{epoch}:}%{version}-%{release} +Requires: libglvnd-devel%{?_isa} >= 1:1.2.0-1 +Provides: libGL-devel +Provides: libGL-devel%{?_isa} + +%description libGL-devel +%{summary}. + +%package libEGL +Summary: Mesa libEGL runtime libraries +Requires: libglvnd-egl%{?_isa} >= 1:1.2.0-1 + +%description libEGL +%{summary}. + +%package libEGL-devel +Summary: Mesa libEGL development package +Requires: %{name}-libEGL%{?_isa} = %{?epoch:%{epoch}:}%{version}-%{release} +Requires: libglvnd-devel%{?_isa} >= 1:1.2.0-1 +Provides: libEGL-devel +Provides: libEGL-devel%{?_isa} + +%description libEGL-devel +%{summary}. + +%package dri-drivers +Summary: Mesa-based DRI drivers +Requires: %{name}-filesystem%{?_isa} = %{?epoch:%{epoch}:}%{version}-%{release} +Requires: libdrm >= 2.4.103 + +%description dri-drivers +%{summary}. + +%if 0%{?with_omx} +%package omx-drivers +Summary: Mesa-based OMX drivers +Requires: %{name}-filesystem%{?_isa} = %{?epoch:%{epoch}:}%{version}-%{release} + +%description omx-drivers +%{summary}. +%endif + +%if 0%{?with_vdpau} +%package vdpau-drivers +Summary: Mesa-based VDPAU drivers +Requires: %{name}-filesystem%{?_isa} = %{?epoch:%{epoch}:}%{version}-%{release} + +%description vdpau-drivers +%{summary}. +%endif + +%package libOSMesa +Summary: Mesa offscreen rendering libraries +Requires: %{name}-libglapi%{?_isa} = %{?epoch:%{epoch}:}%{version}-%{release} +Provides: libOSMesa +Provides: libOSMesa%{?_isa} + +%description libOSMesa +%{summary}. + +%package libOSMesa-devel +Summary: Mesa offscreen rendering development package +Requires: %{name}-libOSMesa%{?_isa} = %{?epoch:%{epoch}:}%{version}-%{release} + +%description libOSMesa-devel +%{summary}. + +%package libgbm +Summary: Mesa gbm runtime library +Provides: libgbm +Provides: libgbm%{?_isa} + +%description libgbm +%{summary}. + +%package libgbm-devel +Summary: Mesa libgbm development package +Requires: %{name}-libgbm%{?_isa} = %{?epoch:%{epoch}:}%{version}-%{release} +Provides: libgbm-devel +Provides: libgbm-devel%{?_isa} + +%description libgbm-devel +%{summary}. + +%if 0%{?with_xa} +%package libxatracker +Summary: Mesa XA state tracker +Provides: libxatracker +Provides: libxatracker%{?_isa} + +%description libxatracker +%{summary}. + +%package libxatracker-devel +Summary: Mesa XA state tracker development package +Requires: %{name}-libxatracker%{?_isa} = %{?epoch:%{epoch}:}%{version}-%{release} +Provides: libxatracker-devel +Provides: libxatracker-devel%{?_isa} + +%description libxatracker-devel +%{summary}. +%endif + +%package libglapi +Summary: Mesa shared glapi +Provides: libglapi +Provides: libglapi%{?_isa} + +%description libglapi +%{summary}. + +%if 0%{?with_opencl} +%package libOpenCL +Summary: Mesa OpenCL runtime library +Requires: ocl-icd%{?_isa} +Requires: libclc%{?_isa} +Requires: %{name}-libgbm%{?_isa} = %{?epoch:%{epoch}:}%{version}-%{release} +Requires: opencl-filesystem + +%description libOpenCL +%{summary}. + +%package libOpenCL-devel +Summary: Mesa OpenCL development package +Requires: %{name}-libOpenCL%{?_isa} = %{?epoch:%{epoch}:}%{version}-%{release} + +%description libOpenCL-devel +%{summary}. +%endif + +%if 0%{?with_nine} +%package libd3d +Summary: Mesa Direct3D9 state tracker + +%description libd3d +%{summary}. + +%package libd3d-devel +Summary: Mesa Direct3D9 state tracker development package +Requires: %{name}-libd3d%{?_isa} = %{?epoch:%{epoch}:}%{version}-%{release} + +%description libd3d-devel +%{summary}. +%endif + +%package vulkan-drivers +Summary: Mesa Vulkan drivers +Requires: vulkan%{_isa} + +%description vulkan-drivers +The drivers with support for the Vulkan API. + +%if 0%{?with_vulkan_hw} +%package vulkan-devel +Summary: Mesa Vulkan development files +Requires: %{name}-vulkan-drivers%{?_isa} = %{?epoch:%{epoch}:}%{version}-%{release} +Requires: vulkan-devel + +%description vulkan-devel +Headers for development with the Vulkan API. +%endif + +%prep +%if 0%{sanitize} +%setup -q -n %{name}-%{version}%{?rctag:-%{rctag}} + cp -f %{SOURCE1} src/gallium/auxiliary/vl/vl_decoder.c + cp -f %{SOURCE2} src/gallium/auxiliary/vl/vl_mpeg12_decoder.c + exit +%else +%autosetup -n %{name}-%{version}%{?rctag:-%{rctag}} -p1 + cmp %{SOURCE1} src/gallium/auxiliary/vl/vl_decoder.c + cmp %{SOURCE2} src/gallium/auxiliary/vl/vl_mpeg12_decoder.c +%endif + +cp %{SOURCE4} docs/ + +pathfix.py -i %{__python3} -pn bin/*.py src/egl/generate/*.py \ + src/gallium/tools/trace/*.py \ + src/compiler/glsl/tests/*.py \ + src/compiler/glsl/glcpp/tests/*.py + +%build + +export ASFLAGS="--generate-missing-build-notes=yes" +%meson -Dcpp_std=gnu++14 \ + -Db_ndebug=true \ + -Dplatforms=x11,wayland \ + -Ddri3=true \ + -Ddri-drivers=%{?dri_drivers} \ +%if 0%{?with_hardware} + -Dgallium-drivers=swrast%{?with_iris:,iris},virgl,nouveau%{?with_vmware:,svga},radeonsi,r600%{?with_freedreno:,freedreno}%{?with_etnaviv:,etnaviv}%{?with_tegra:,tegra}%{?with_vc4:,vc4}%{?with_kmsro:,kmsro} \ +%else + -Dgallium-drivers=swrast,virgl \ +%endif + -Dgallium-vdpau=%{?with_vdpau:true}%{!?with_vdpau:false} \ + -Dgallium-xvmc=false \ + -Dgallium-omx=%{?with_omx:bellagio}%{!?with_omx:disabled} \ + -Dgallium-va=%{?with_vaapi:true}%{!?with_vaapi:false} \ + -Dgallium-xa=%{?with_xa:true}%{!?with_xa:false} \ + -Dgallium-nine=%{?with_nine:true}%{!?with_nine:false} \ + -Dgallium-opencl=%{?with_opencl:icd}%{!?with_opencl:disabled} \ + -Dvulkan-drivers=%{?vulkan_drivers} \ + -Dshared-glapi=true \ + -Dgles1=false \ + -Dgles2=true \ + -Dopengl=true \ + -Dgbm=true \ + -Dglx=dri \ + -Degl=true \ + -Dglvnd=true \ + -Dasm=%{?with_asm:true}%{!?with_asm:false} \ + -Dllvm=true \ + -Dshared-llvm=true \ + -Dvalgrind=%{?with_valgrind:true}%{!?with_valgrind:false} \ + -Dbuild-tests=false \ + -Dselinux=true \ + -Dosmesa=gallium \ + -Dvulkan-device-select-layer=true \ + %{nil} +%meson_build + +%install +%meson_install + +# libvdpau opens the versioned name, don't bother including the unversioned +rm -vf %{buildroot}%{_libdir}/vdpau/*.so +# likewise glvnd +rm -vf %{buildroot}%{_libdir}/libGLX_mesa.so +rm -vf %{buildroot}%{_libdir}/libEGL_mesa.so +# XXX can we just not build this +rm -vf %{buildroot}%{_libdir}/libGLES* + +# glvnd needs a default provider for indirect rendering where it cannot +# determine the vendor +ln -s %{_libdir}/libGLX_mesa.so.0 %{buildroot}%{_libdir}/libGLX_system.so.0 + +# strip out useless headers +rm -f %{buildroot}%{_includedir}/GL/w*.h + +# these are shipped already in vulkan-devel +rm -f %{buildroot}/%{_includedir}/vulkan/vk_platform.h +rm -f %{buildroot}/%{_includedir}/vulkan/vulkan.h + +# remove .la files +find %{buildroot} -name '*.la' -delete + +# this keeps breaking, check it early. note that the exit from eu-ftr is odd. +pushd %{buildroot}%{_libdir} +for i in libOSMesa*.so libGL.so ; do + eu-findtextrel $i && exit 1 +done + +%files filesystem +%doc docs/Mesa-MLAA-License-Clarification-Email.txt +%dir %{_libdir}/dri +%if %{with_hardware} +%if 0%{?with_vdpau} +%dir %{_libdir}/vdpau +%endif +%endif + +%files libGL +%{_libdir}/libGLX_mesa.so.0* +%{_libdir}/libGLX_system.so.0* +%files libGL-devel +%dir %{_includedir}/GL/internal +%{_includedir}/GL/internal/dri_interface.h +%{_libdir}/pkgconfig/dri.pc +%{_libdir}/libglapi.so + +%files libEGL +%{_datadir}/glvnd/egl_vendor.d/50_mesa.json +%{_libdir}/libEGL_mesa.so.0* +%files libEGL-devel +%dir %{_includedir}/EGL +%{_includedir}/EGL/eglmesaext.h +%{_includedir}/EGL/eglextchromium.h + +%post libglapi -p /sbin/ldconfig +%postun libglapi -p /sbin/ldconfig +%files libglapi +%{_libdir}/libglapi.so.0 +%{_libdir}/libglapi.so.0.* + +%post libOSMesa -p /sbin/ldconfig +%postun libOSMesa -p /sbin/ldconfig +%files libOSMesa +%{_libdir}/libOSMesa.so.8* +%files libOSMesa-devel +%dir %{_includedir}/GL +%{_includedir}/GL/osmesa.h +%{_libdir}/libOSMesa.so +%{_libdir}/pkgconfig/osmesa.pc + +%post libgbm -p /sbin/ldconfig +%postun libgbm -p /sbin/ldconfig +%files libgbm +%{_libdir}/libgbm.so.1 +%{_libdir}/libgbm.so.1.* +%files libgbm-devel +%{_libdir}/libgbm.so +%{_includedir}/gbm.h +%{_libdir}/pkgconfig/gbm.pc + +%if 0%{?with_xa} +%post libxatracker -p /sbin/ldconfig +%postun libxatracker -p /sbin/ldconfig +%files libxatracker +%if %{with_hardware} +%{_libdir}/libxatracker.so.2 +%{_libdir}/libxatracker.so.2.* +%endif + +%files libxatracker-devel +%if %{with_hardware} +%{_libdir}/libxatracker.so +%{_includedir}/xa_tracker.h +%{_includedir}/xa_composite.h +%{_includedir}/xa_context.h +%{_libdir}/pkgconfig/xatracker.pc +%endif +%endif + +%if 0%{?with_opencl} +%post libOpenCL -p /sbin/ldconfig +%postun libOpenCL -p /sbin/ldconfig +%files libOpenCL +%{_libdir}/libMesaOpenCL.so.* +%{_sysconfdir}/OpenCL/vendors/mesa.icd +%files libOpenCL-devel +%{_libdir}/libMesaOpenCL.so +%endif + +%if 0%{?with_nine} +%files libd3d +%dir %{_libdir}/d3d/ +%{_libdir}/d3d/*.so.* + +%files libd3d-devel +%{_libdir}/pkgconfig/d3d.pc +%{_includedir}/d3dadapter/ +%{_libdir}/d3d/*.so +%endif + +%files dri-drivers +%dir %{_datadir}/drirc.d +%{_datadir}/drirc.d/00-mesa-defaults.conf +%if %{with_hardware} +%{_libdir}/dri/r600_dri.so +%{_libdir}/dri/radeonsi_dri.so +%ifarch %{ix86} x86_64 +%{_libdir}/dri/i965_dri.so +%{_libdir}/dri/iris_dri.so +%endif +%if 0%{?with_vc4} +%{_libdir}/dri/vc4_dri.so +%endif +%if 0%{?with_freedreno} +%{_libdir}/dri/kgsl_dri.so +%{_libdir}/dri/msm_dri.so +%endif +%if 0%{?with_etnaviv} +%{_libdir}/dri/etnaviv_dri.so +%{_libdir}/dri/imx-drm_dri.so +%endif +%{_libdir}/dri/nouveau_dri.so +%if 0%{?with_vmware} +%{_libdir}/dri/vmwgfx_dri.so +%endif +#{_libdir}/dri/nouveau_drv_video.so +#{_libdir}/dri/r600_drv_video.so +#{_libdir}/dri/radeonsi_drv_video.so +%endif +%{_libdir}/dri/kms_swrast_dri.so +%{_libdir}/dri/swrast_dri.so +%{_libdir}/dri/virtio_gpu_dri.so + +%if %{with_hardware} +%if 0%{?with_omx} +%files omx-drivers +%{_libdir}/bellagio/libomx_mesa.so +%endif +%if 0%{?with_vdpau} +%files vdpau-drivers +%{_libdir}/vdpau/libvdpau_nouveau.so.1* +%{_libdir}/vdpau/libvdpau_r600.so.1* +%{_libdir}/vdpau/libvdpau_radeonsi.so.1* +%endif +%endif + +%files vulkan-drivers +%if 0%{?with_vulkan_hw} +%{_libdir}/libvulkan_intel.so +%{_libdir}/libvulkan_radeon.so +%ifarch x86_64 +%{_datadir}/vulkan/icd.d/intel_icd.x86_64.json +%{_datadir}/vulkan/icd.d/radeon_icd.x86_64.json +%else +%{_datadir}/vulkan/icd.d/intel_icd.i686.json +%{_datadir}/vulkan/icd.d/radeon_icd.i686.json +%endif +%endif +%{_libdir}/libvulkan_lvp.so +%{_datadir}/vulkan/icd.d/lvp_icd.*.json +%{_libdir}/libVkLayer_MESA_device_select.so +%{_datadir}/vulkan/implicit_layer.d/VkLayer_MESA_device_select.json + +%if 0%{?with_vulkan_hw} +%files vulkan-devel +%{_includedir}/vulkan/ +%endif + +%changelog +* Tue Feb 16 2021 Dave Airlie - 20.3.3-1 +- Update to 20.3.3 + upstream fixes for qemu regression + +* Mon Jan 11 2021 Dave Airlie - 20.3.2-1 +- Update to 20.3.2 for upstream fixes + +* Mon Dec 21 2020 Dave Airlie - 20.3.1-1 +- Update to 20.3.1 for radeon fix + +* Mon Dec 07 2020 Dave Airlie - 20.3.0-2 +- Fix regression with radeon si/cik cards + +* Fri Dec 04 2020 Dave Airlie - 20.3.0-1 +- Update to 20.3.0 release + +* Thu Nov 19 2020 Dave Airlie - 20.3.0-0.1.rc2 +- Update 20.3.0-rc2 +- enable lavapipe behind env var so it can be used for testing + +* Wed Aug 05 2020 Dave Airlie - 20.1.4-1 +- Update to 20.1.4 +- Update nouveau tu1xx support patch (Karol) + +* Mon Jun 29 2020 Dave Airlie - 20.1.2-3 +- a fix on top of the big-endian fix (#1847064) + +* Mon Jun 29 2020 Dave Airlie - 20.1.2-2 +- add another fix for big-endian llvmpipe (#1847064) + +* Mon Jun 29 2020 Dave Airlie - 20.1.2-1 +- Update to 20.1.2 +- add fix for big-endian llvmpipe (#1847064) + +* Thu Jun 11 2020 Dave Airlie - 20.1.1-1 +- Update to 20.1.1 +- Add support for turing + +* Thu May 28 2020 Dave Airlie - 20.1.0-1 +- Update to 20.1.0 final + +* Mon May 25 2020 Dave Airlie - 20.1.0-0.1.rc4 +- Update to 20.1.0-rc4 + +* Thu Feb 20 2020 Dave Airlie - 19.3.4-2 +- Fix put image shm fallback path. + +* Sat Feb 15 2020 Dave Airlie - 19.3.4-1 +- Update to 19.3.4 release (s390x fix) + +* Thu Jan 30 2020 Dave Airlie - 19.3.3-1 +- Update to 19.3.3 release + +* Mon Nov 25 2019 Dave Airlie - 19.3.0-3 +- drop khr-devel subpackage from here + +* Fri Nov 22 2019 Dave Airlie - 19.3.0-2 +- sort out libglvnd requires + +* Thu Nov 21 2019 Dave Airlie - 19.3.0-1 +- mesa-19.3.0-rc4 + +* Fri Aug 09 2019 Dave Airlie - 19.1.4-2 +- Add CET support to asm files + +* Mon Aug 05 2019 Dave Airlie - 19.1.4-1 +- mesa-19.1.4 + +* Thu Jun 06 2019 Dave Airlie - 19.1.0-0.5 +- mesa-19.1.0-rc5 + +* Thu May 30 2019 Dave Airlie - 19.1.0-0.4 +- mesa-19.1.0-rc4 + +* Wed May 22 2019 Dave Airlie - 19.1.0-0.3 +- mesa-19.1.0-rc3 +- disable asserts explicitly + +* Thu May 16 2019 Dave Airlie - 19.1.0-0.2 +- mesa 19.1.0-rc2 +- bring back glesv2.pc + +* Fri May 10 2019 Dave Airlie - 19.1.0-0.1 +- mesa 19.1.0-rc1 + +* Thu Apr 04 2019 Dave Airlie - 18.3.1-5 +- Fix remote shm detection again + +* Tue Mar 26 2019 Dave Airlie - 18.3.1-4 +- Fix remove shm detection + +* Wed Mar 20 2019 Dave Airlie - 18.3.1-3 +- Add shm leak fix + +* Tue Jan 29 2019 Dave Airlie - 18.3.1-2 +- fix shm swrast + +* Thu Dec 13 2018 Dave Airlie - 18.3.1-1 +- Mesa 18.3.1 - move to release + +* Wed Dec 12 2018 Tom Stellard +- Rebuild for LLVM 7.0.1 + +* Tue Nov 20 2018 Adam Jackson - 18.3.0-0.2 +- Mesa 18.3.0 RC2 +- Drop python3 build system backport +- Drop no-longer-necessary big-endian build fix +- Re-enable 10bpc fbconfigs + +* Wed Oct 10 2018 Adam Jackson - 18.2.2-1 +- Mesa 18.2.2 + +* Fri Sep 28 2018 Adam Jackson - 18.2.1-1 +- Mesa 18.2.1 +- Fix "HW cursor for format" error message flood with swrast + +* Fri Sep 28 2018 Adam Jackson - 18.2.0-2 +- Drop unneeded BuildRequires: makedepend + +* Tue Sep 11 2018 Dave Airlie - 18.2.0-1 +- mesa 18.2.0 + +* Thu Aug 16 2018 Ray Strode - 18.1.3-4 +- Fix crash on screen resolution change + Resolves: #1616390 + +* Thu Aug 02 2018 Tom Stellard - 18.1.3-3 +- Rebuild for LLVM 6.0 + +* Tue Jul 24 2018 Dave Airlie - 18.1.3-2 +- rename fallback for glvnd + +* Fri Jul 06 2018 Adam Jackson - 18.1.3-1 +- Mesa 18.1.3 + +* Wed Jun 20 2018 Adam Jackson - 18.1.2-2 +- Disable arm-specific drivers +- Use alternate glvnd indirect library name + +* Wed Jun 20 2018 Adam Jackson - 18.1.2-1 +- Mesa 18.1.2 + +* Mon Jun 18 2018 Adam Jackson - 18.0.5-1 +- Mesa 18.0.5 + +* Tue May 29 2018 Adam Jackson - 18.0.3-1 +- Mesa 18.0.3 +- Disable old drivers: radeon, r200, r300, i915, vieux + +* Fri May 04 2018 Dave Airlie - 18.0.2-2 +- Disable omx/opencl/nine + +* Tue May 01 2018 Adam Jackson - 18.0.2-1 +- Mesa 18.0.2 + +* Thu Mar 08 2018 Tom Stellard - 17.3.6-2 +- Use llvm-toolset + +* Tue Feb 27 2018 Adam Jackson - 17.3.6-1 +- Update to 17.3.6 + +* Mon Feb 26 2018 Igor Gnatenko - 17.3.5-2 +- Backport patch to fix video corruption + +* Tue Feb 20 2018 Igor Gnatenko - 17.3.5-1 +- Update to 17.3.5 + +* Thu Feb 15 2018 Igor Gnatenko - 17.3.4-1 +- Update to 17.3.4 + +* Mon Jan 22 2018 Peter Robinson 17.3.3-1 +- Update to 17.3.3 + +* Mon Jan 01 2018 Igor Gnatenko - 17.3.1-1 +- Update to 17.3.1 + +* Fri Nov 10 2017 Igor Gnatenko - 17.3.0-0.4.rc3 +- Sanitize tarball + +* Wed Nov 8 2017 Peter Robinson 17.3.0-0.3.rc3 +- Update to 17.3.0-rc3 + +* Tue Oct 31 2017 Peter Robinson 17.3.0-0.1.rc2 +- Update to 17.3.0-rc2 + +* Tue Oct 31 2017 Peter Robinson 17.2.4-1 +- Update to 17.2.4 GA + +* Mon Oct 23 2017 Tom Stellard - 17.2.3-2 +- Rebuild for LLVM 5.0.0 + +* Thu Oct 19 2017 Gwyn Ciesla - 17.2.3-1 +- 17.2.3, bugfix release. + +* Wed Oct 11 2017 Peter Robinson - 17.2.2-4 +- Fix for vc4/Raspberry Pi + +* Mon Oct 09 2017 Dave Airlie - 17.2.2-3 +- enable vulkan on 32-bit x86 + +* Tue Oct 03 2017 Adam Jackson - 17.2.2-2 +- Backport S3TC support from master + +* Tue Oct 3 2017 Peter Robinson 17.2.2-1 +- Update to 17.2.2 GA + +* Wed Sep 20 2017 Peter Robinson 17.2.1-1 +- Update to 17.2.1 GA + +* Mon Sep 11 2017 Peter Robinson 17.2.0-2 +- Add upstream patch for glibc xlocale.h change (fdo bz 102454) + +* Tue Sep 5 2017 Peter Robinson 17.2.0-1 +- Update to 17.2.0 GA + +* Thu Aug 31 2017 Peter Robinson 17.2.0-0.3.rc6 +- Update to 17.2.0-rc6 + +* Tue Aug 22 2017 Peter Robinson 17.2.0-0.2.rc5 +- Update to 17.2.0-rc5 + +* Sun Aug 13 2017 Peter Robinson 17.2.0-0.1.rc4 +- Update to 17.2.0-rc4 + +* Thu Aug 03 2017 Fedora Release Engineering - 17.1.5-1.2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild + +* Wed Jul 26 2017 Fedora Release Engineering - 17.1.5-1.1 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild + +* Mon Jul 17 2017 Peter Robinson 7.1.5-1 +- Update to 17.1.5 + +* Thu Jul 13 2017 Adam Jackson +- Stop replacing eglext.h, we're up to date again + +* Sat Jul 1 2017 Peter Robinson 7.1.4-1 +- Update to 17.1.4 + +* Mon Jun 19 2017 Peter Robinson 7.1.3-2 +- Fixes and perf improvements for vc4 + +* Mon Jun 19 2017 Peter Robinson 7.1.3-1 +- Update to 17.1.3 + +* Wed Jun 14 2017 Peter Robinson 7.1.2-2 +- Some etnaviv fixes + +* Mon Jun 5 2017 Peter Robinson 7.1.2-1 +- Update to 17.1.2 + +* Mon Jun 05 2017 Adam Jackson - 17.1.1-2 +- Disable BGRA8 images on Fermi + +* Thu May 25 2017 Peter Robinson 17.1.1-1 +- Update to 17.1.1 + +* Thu May 11 2017 Dave Airlie - 17.1.0-1 +- Update to 17.1.0 + +* Tue May 9 2017 Peter Robinson 17.1.0-0.4.rc4 +- Update to 17.1.0-rc4 + +* Fri Apr 28 2017 Peter Robinson 17.1.0-0.3.rc2 +- Enable renderonly support for i.MX SoC (rhbz #1424714) + +* Mon Apr 24 2017 Peter Robinson 17.1.0-0.2.rc2 +- Update to 17.1.0-rc2 + +* Tue Apr 18 2017 Igor Gnatenko - 17.1.0-0.1.rc1 +- Update to 17.1.0-rc1 + +* Sun Apr 02 2017 Igor Gnatenko - 17.0.3-1 +- Update to 17.0.3 + +* Fri Mar 24 2017 Igor Gnatenko - 17.0.2-2 +- Rebuild for LLVM4 + +* Mon Mar 20 2017 Peter Robinson 17.0.2-1 +- Update to 17.0.2 + +* Mon Mar 20 2017 Hans de Goede - 17.0.1-3 +- Fix glXGetDriverConfig not working with glvnd (rhbz#1429894) +- Fix indirect rendering, add libGLX_indirect.so.0 symlink (rhbz#1427174) + +* Tue Mar 14 2017 Peter Robinson 17.0.1-2 +- Rebuild for aarch64 llvmpipe fix (rhbz 1429050) + +* Sun Mar 05 2017 Igor Gnatenko - 17.0.1-1 +- Update to 17.0.1 + +* Mon Feb 13 2017 Peter Robinson 17.0.0-1 +- 17.0.0 GA + +* Mon Feb 6 2017 Peter Robinson 17.0.0-0.6.rc3 +- Update to 17.0.0-rc3 + +* Mon Feb 6 2017 Hans de Goede - 17.0.0-0.5.rc2 +- Fix GLX_SGIX_fbconfig extension dispatching with glvnd, this fixes games such + as "The Binding of Isaac: Rebirth" and "Crypt of the NecroDancer" from Steam + +* Thu Feb 2 2017 Hans de Goede - 17.0.0-0.4.rc2 +- Update eglext.h to 20161230 version this brings in some new defines needed + by some apps / libraries + +* Sat Jan 28 2017 Peter Robinson 17.0.0-0.3.rc2 +- Update to 17.0.0-rc2 + +* Sat Jan 21 2017 Peter Robinson 17.0.0-0.2.rc1 +- Enable etnaviv gallium driver + +* Fri Jan 20 2017 Igor Gnatenko - 17.0.0-0.rc1 +- Update to 17.0.0-rc1 + +* Tue Jan 17 2017 Hans de Goede - 13.0.3-3 +- Enable libglvnd support (rhbz#1413579) + +* Thu Jan 12 2017 Igor Gnatenko - 13.0.3-2 +- Add valgrind BuildRequires to have valgrind support + +* Fri Jan 6 2017 Peter Robinson 13.0.3-1 +- 13.0.3 GA + +* Mon Dec 12 2016 Igor Gnatenko - 13.0.2-2 +- Use nettle for sha1 + +* Tue Nov 29 2016 Peter Robinson 13.0.2-1 +- 13.0.2 GA + +* Tue Nov 15 2016 Peter Robinson 13.0.1-1 +- 13.0.1 GA + +* Wed Nov 2 2016 Peter Robinson 13.0.0-3 +- Don't ship duplicate vulkan devel headers + +* Wed Nov 2 2016 Peter Robinson 13.0.0-2 +- Add options for enabling vulkan components +- Enable intel/radeon vulkan drivers + +* Wed Nov 2 2016 Peter Robinson 13.0.0-1 +- 13.0.0 GA + +* Tue Nov 01 2016 Dave Airlie - 13.0.0-0.3.rc2 +- rebuild for llvm 3.9 + +* Mon Oct 24 2016 Peter Robinson 13.0.0-0.2.rc2 +- 13.0.0-rc2 + +* Thu Oct 20 2016 Igor Gnatenko - 13.0.0-0.1.rc1 +- 13.0.0-rc1 + +* Tue Oct 11 2016 Hans de Goede - 12.0.3-2 +- Add 2 patches from upstream to fix DRI3 vaapi crashes (rhbz1309446, fdo71759) + +* Sun Sep 18 2016 Peter Robinson 12.0.3-1 +- 12.0.3 + +* Mon Sep 5 2016 Peter Robinson 12.0.2-1 +- 12.0.2 + +* Mon Sep 5 2016 Hans de Goede - 12.0.1-7 +- Fix PRIME fd leak + +* Tue Aug 23 2016 Adam Jackson - 12.0.1-6 +- Remove BuildRequires: xorg-x11-server-devel + +* Mon Aug 15 2016 Igor Gnatenko - 12.0.1-5 +- Fix broken deps with OpenCL + +* Sun Aug 14 2016 Igor Gnatenko - 12.0.1-4 +- Fix broken deps + +* Sun Aug 14 2016 Igor Gnatenko - 12.0.1-3 +- Slightly refactor spec +- Drop virtual provides for OCL + +* Tue Jul 19 2016 Orion Poplawski - 12.0.1-2 +- Add missing %%{?_isa} to requires in some devel sub-packages (bug #1138463) + +* Sun Jul 10 2016 Igor Gnatenko - 12.0.1-1 +- 12.0.1 + +* Fri Jul 08 2016 Igor Gnatenko - 12.0.0-1 +- 12.0.0 + +* Wed Jun 22 2016 Igor Gnatenko - 12.0.0-0.3.rc4 +- 12.0.0-rc4 + +* Mon Jun 20 2016 Adam Jackson - 12.0.0-0.3.rc3 +- Fix packaging error on s390* + +* Mon Jun 20 2016 Igor Gnatenko - 12.0.0-0.2.rc3 +- 12.0.0-rc3 + +* Tue Jun 14 2016 Dominik Mierzejewski - 12.0.0-0.2.rc2 +- add missing dependency for /etc/OpenCL/vendors ownership (RHBZ #1265948) + +* Tue Jun 14 2016 Igor Gnatenko - 12.0.0-0.1.rc2 +- 12.0.0-rc2 + +* Wed Jun 01 2016 Igor Gnatenko - 12.0.0-0.1.rc1 +- 12.0.0-rc1 + +* Sun May 01 2016 Igor Gnatenko - 11.3.0-0.4.gitcbcd7b6 +- cbcd7b6 + +* Thu Apr 14 2016 Igor Gnatenko - 11.3.0-0.3.git171a570 +- 171a570 + +* Fri Apr 08 2016 Björn Esser - 11.3.0-0.2.gitea2bff1 +- add virtual Provides for ocl-icd (RHBZ #1317602) + +* Sun Mar 20 2016 Igor Gnatenko - 11.3.0-0.1.gitea2bff1 +- 11.3.0 (gitea2bff1) +- Add SWR state-tracker (but disable because build is broken) +- Use gallium-osmesa instead of classic osmesa (RHBZ #1305588) +- Remove very old changelogs + +* Sun Mar 20 2016 Igor Gnatenko - 11.2.0-0.1.rc3.20160320 +- Update to 11.2.0-rc3 + +* Fri Feb 19 2016 Dave Airlie 11.2.0-0.devel.11 +- rebuild against llvm 3.8.0 + +* Fri Feb 12 2016 Dave Airlie 11.2.0-0.devel.10 +- rebuild against new llvm packages + +* Thu Feb 11 2016 Adam Jackson 11.2.0-0.devel.9 +- Fix OpenCL-enabled FTBFS by not forcing clang search path to /usr/lib + +* Thu Feb 04 2016 Fedora Release Engineering - 11.2.0-0.devel.8.24ea81a.1 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild + +* Wed Jan 27 2016 Adam Jackson 11.2.0-0.devel.8 +- Rebuild for llvm 3.7.1 library split + +* Sun Jan 24 2016 Igor Gnatenko - 11.2.0-0.devel.7.24ea81a +- 24ea81a + +* Thu Jan 21 2016 Peter Robinson 11.2.0-0.devel.6.5e3edd4 +- OpenCL now supported on aarch64 + +* Sun Jan 10 2016 Igor Gnatenko - 11.2.0-0.devel.5.5e3edd4 +- 5e3edd4 + +* Thu Jan 07 2016 Adam Jackson +- Mangle libtool even harder to get -static-libstdc++ to work + +* Tue Dec 29 2015 Igor Gnatenko - 11.2.0-0.devel.3.70d8dbc +- 70d8dbc + +* Wed Dec 02 2015 Igor Gnatenko - 11.2.0-0.devel.2.56aff6b +- 56aff6b + +* Sun Nov 22 2015 Igor Gnatenko - 11.2.0-0.devel.1.86fc97d +- 86fc97d + +* Thu Nov 05 2015 Igor Gnatenko - 11.1.0-0.devel.13.5ae37ae +- 5ae37ae + +* Thu Nov 05 2015 Adam Jackson 11.1.0-0.devel.12.3994ef5 +- Link with -static-libstdc++ to work around Steam bundling its own copy + +* Fri Oct 23 2015 Igor Gnatenko - 11.1.0-0.devel.11.3994ef5 +- 3994ef5 +- Enable VirGL driver + +* Thu Oct 22 2015 Igor Gnatenko - 11.1.0-0.devel.10.7182498 +- 7182498 +- Disable SWR rasterizer + +* Wed Oct 21 2015 Igor Gnatenko - 11.1.0-0.devel.9.4a168ad +- Enable experimental SWR rasterizer + +* Wed Oct 14 2015 Igor Gnatenko - 11.1.0-0.devel.8.4a168ad +- 4a168ad + +* Wed Oct 07 2015 Igor Gnatenko - 11.1.0-0.devel.7.47d1199 +- 47d1199 + +* Sat Sep 26 2015 Igor Gnatenko - 11.1.0-0.devel.6.9932142 +- 9932142 + +* Wed Sep 16 2015 Igor Gnatenko - 11.1.0-0.devel.5.47e18a5 +- 47e18a5 +- Rebuild against llvm 3.7 + +* Sun Sep 13 2015 Igor Gnatenko - 11.1.0-0.devel.4.d6fbcf6 +- d6fbcf6 + +* Thu Sep 10 2015 Rex Dieter - 11.1.0-0.devel.3.60aea30 +- Add brw_meta_fast_clear crash workaround patch (#1259443, fdo#86281) + +* Wed Sep 02 2015 Igor Gnatenko - 11.1.0-0.devel.2.60aea30 +- 60aea30 + +* Mon Aug 24 2015 Igor Gnatenko - 11.1.0-0.devel.1.4e5752e +- 4e5752e + +* Sun Aug 09 2015 Igor Gnatenko - 11.0.0-0.devel.2.21ccdbd +- 21ccdbd +- add surfaceless EGL platform (RHBZ #1251747) + +* Sat Aug 01 2015 Igor Gnatenko - 11.0.0-0.devel.1.6f2d889 +- Update to 11.0.0 + +* Tue Jul 14 2015 Peter Robinson 10.7.0-0.devel.4.ea633db +- Use %%license +- Minor spec cleanups + +* Tue Jul 14 2015 Igor Gnatenko - 10.7.0-0.devel.3.ea633db +- ea633db + +* Tue Jul 07 2015 Igor Gnatenko - 10.7.0-0.devel.2.8787141 +- Drop unecessary make for s390 + +* Mon Jun 22 2015 Igor Gnatenko - 10.7.0-0.devel.1.8787141 +- 8787141 + +* Wed Jun 17 2015 Fedora Release Engineering - 10.6.0-0.devel.7.5a55f68.1 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild + +* Mon May 18 2015 Igor Gnatenko - 10.6.0-0.devel.7.5a55f68 +- add git to BR everywhere + +* Sun May 17 2015 Igor Gnatenko - 10.6.0-0.devel.6.5a55f68 +- 5a55f68 + +* Thu May 07 2015 Igor Gnatenko - 10.6.0-0.devel.5.51e3453 +- 51e3453 + +* Mon Apr 20 2015 Igor Gnatenko - 10.6.0-0.devel.4.c1485f4 +- c1485f4 + +* Thu Apr 09 2015 Adam Jackson 10.6.0-0.devel.3 +- F23 rebuild against llvm 3.6.0 + +* Fri Feb 27 2015 Rob Clark - 10.6.0-0.devel.1.f80af89 +- f80af89 + +* Wed Feb 18 2015 Igor Gnatenko - 10.5.0-1.20150218 +- 10.5.0 + +* Fri Jan 02 2015 Igor Gnatenko - 10.5.0-0.devel.32.6171131 +- 6171131 + +* Fri Jan 02 2015 Igor Gnatenko - 10.5.0-0.devel.31.c3260f8 +- c3260f8 + +* Fri Jan 02 2015 Igor Gnatenko - 10.5.0-0.devel.30.290553b +- 290553b + +* Thu Jan 01 2015 Igor Gnatenko - 10.5.0-0.devel.28.b77eaaf +- b77eaaf + +* Thu Jan 01 2015 Igor Gnatenko - 10.5.0-0.devel.26.c633528 +- c633528 + +* Thu Jan 01 2015 Igor Gnatenko - 10.5.0-0.devel.25.a6f6d61 +- a6f6d61 + +* Wed Dec 31 2014 Igor Gnatenko - 10.5.0-0.devel.23.be0311c +- be0311c + +* Wed Dec 31 2014 Igor Gnatenko - 10.5.0-0.devel.21.609c3e5 +- 609c3e5 + +* Wed Dec 31 2014 Igor Gnatenko - 10.5.0-0.devel.19.3ba57ba +- 3ba57ba + +* Tue Dec 30 2014 Igor Gnatenko - 10.5.0-0.devel.17.64dcb2b +- 64dcb2b + +* Mon Dec 29 2014 Igor Gnatenko - 10.5.0-0.devel.15.6c18279 +- 6c18279 + +* Sat Dec 27 2014 Igor Gnatenko - 10.5.0-0.devel.13.0c7f895 +- 0c7f895 + +* Fri Dec 26 2014 Igor Gnatenko - 10.5.0-0.devel.11.cb5a372 +- cb5a372 + +* Sun Dec 21 2014 Igor Gnatenko - 10.5.0-0.devel.10.git0d7f4c8 +- enable ilo gallium driver + +* Fri Dec 19 2014 Dan Horák 10.5.0-0.devel.9 +- Sync with_{vaapi,vdpau,nine} settings with F21 + +* Thu Dec 18 2014 Adam Jackson 10.5.0-0.devel.8 +- Sync ppc build config with F21 + +* Wed Dec 17 2014 Igor Gnatenko - 10.5.0-0.devel.7.git0d7f4c8 +- fix requirements for d3d + +* Sun Dec 14 2014 Igor Gnatenko - 10.5.0-0.devel.6.git0d7f4c8 +- 0d7f4c8 + +* Sun Dec 14 2014 Igor Gnatenko - 10.5.0-0.devel.5.git29c7cf2 +- Enable VA state-tracker +- Enable Nine state-tracker (Direct3D9 API) + +* Thu Dec 11 2014 Adam Jackson 10.5.0-0.devel.4 +- Restore hardware drivers on ppc64{,le} + +* Tue Dec 02 2014 Igor Gnatenko - 10.5.0-0.devel.3.git29c7cf2 +- 29c7cf2 + +* Sat Nov 22 2014 Igor Gnatenko - 10.5.0-0.devel.2.git3d9c1a9 +- 3d9c1a9 + +* Wed Nov 19 2014 Igor Gnatenko - 10.5.0-0.devel.1.git9460cd3 +- 9460cd3 + +* Mon Nov 10 2014 Igor Gnatenko - 10.4-0.devel.8.gitf3b709c +- f3b709c + +* Tue Oct 28 2014 10.4-0.devel.7.git1a17098 +- rebuild for llvm + +* Mon Oct 27 2014 Igor Gnatenko - 10.4-0.devel.6.git1a17098 +- 1a17098 + +* Sat Sep 27 2014 Igor Gnatenko - 10.4-0.devel.5.gitc3f17bb +- c3f17bb18f597d7f606805ae94363dae7fd51582 + +* Sat Sep 06 2014 Igor Gnatenko - 10.4-0.devel.4.git1f184bc +- apply patch for bigendian from karsten +- fix ppc filelist from karsten + +* Sat Sep 06 2014 Igor Gnatenko - 10.4-0.devel.3.git1f184bc +- 1f184bc114143acbcea373184260da777b6c6be1 commit + +* Thu Aug 28 2014 Igor Gnatenko - 10.4-0.devel.2.1.80771e47b6c1e47ab55f17311e1d4e227a9eb3d8 +- add swrast to dri driver list + +* Wed Aug 27 2014 Igor Gnatenko - 10.4-0.devel.2.80771e47b6c1e47ab55f17311e1d4e227a9eb3d8 +- 80771e47b6c1e47ab55f17311e1d4e227a9eb3d8 commit + +* Sat Aug 23 2014 Igor Gnatenko - 10.4-0.devel.1.c2867f5b3626157379ef0d4d5bcaf5180ca0ec1f +- 10.4 c2867f5b3626157379ef0d4d5bcaf5180ca0ec1f + +* Fri Aug 22 2014 Igor Gnatenko - 10.3-0.rc1.1.e7f2f2dea5acdbd1a12ed88914e64a38a97432f0 +- e7f2f2dea5acdbd1a12ed88914e64a38a97432f0 commit + +* Sun Aug 17 2014 Fedora Release Engineering - 10.3-0.devel.2.c40d7d6d948912a4d51cbf8f0854cf2ebe916636.1 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild + +* Wed Aug 06 2014 Igor Gnatenko - 10.3-0.devel.2.c40d7d6d948912a4d51cbf8f0854cf2ebe916636 +- c40d7d6d948912a4d51cbf8f0854cf2ebe916636 commit + +* Fri Jul 11 2014 Igor Gnatenko - 10.3-0.devel.1.f381c27c548aa28b003c8e188f5d627ab4105f76 +- Rebase to 'master' branch (f381c27c548aa28b003c8e188f5d627ab4105f76 commit) + +* Fri Jul 11 2014 Igor Gnatenko - 10.2.3-1.20140711 +- 10.2.3 upstream release + +* Mon Jul 7 2014 Peter Robinson 10.2.2-4.20140625 +- Build aarch64 options the same as ARMv7 +- Fix PPC conditionals + +* Fri Jul 04 2014 Igor Gnatenko - 10.2.2-3.20140625 +- Fix up intelInitScreen2 for DRI3 (RHBZ #1115323) (patch from drago01) + +* Fri Jun 27 2014 Dave Airlie 10.2.2-2.20140625 +- add dri3 gnome-shell startup fix from Jasper. + +* Wed Jun 25 2014 Igor Gnatenko - 10.2.2-1.20140625 +- 10.2.2 upstream release + +* Wed Jun 11 2014 Igor Gnatenko - 10.2.1-2.20140608 +- drop radeonsi llvm hack + +* Sun Jun 08 2014 Igor Gnatenko - 10.2.1-1.20140608 +- 10.2.1 upstream release + +* Sat Jun 07 2014 Fedora Release Engineering - 10.2-0.11.rc5.20140531 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild + +* Wed Jun 04 2014 Dan Horák - 10.2-0.10.rc5.20140531 +- fix build without hardware drivers + +* Sat May 31 2014 Igor Gnatenko - 10.2-0.9.rc5.20140531 +- 10.2-rc5 upstream release + +* Wed May 28 2014 Brent Baude - 10.2-0.8.rc4.20140524 +- Removing ppc64le arch from with_llvm + +* Wed May 28 2014 Igor Gnatenko - 10.2-0.7.rc4.20140524 +- i915: add a missing NULL pointer check (RHBZ #1100967) + +* Sat May 24 2014 Igor Gnatenko - 10.2-0.6.rc4.20140524 +- 10.2-rc4 upstream release +- add back updated radeonsi hack for LLVM + +* Sat May 17 2014 Igor Gnatenko - 10.2-0.5.rc3.20140517 +- 10.2-rc3 upstream release + +* Sat May 10 2014 Igor Gnatenko - 10.2-0.4.rc2.20140510 +- 10.2-rc2 upstream release +- drop radeonsi hack for LLVM + +* Tue May 06 2014 Igor Gnatenko - 10.2-0.3.rc1.20140505 +- Move gallium-pipe to the correct sub-package (RHBZ #1094588) (kwizart) +- Move egl_gallium.so to the correct location (RHBZ #1094588) (kwizart) +- Switch from with to enable for llvm shared libs (kwizart) + +* Mon May 05 2014 Igor Gnatenko - 10.2-0.2.rc1.20140505 +- Enable gallium-egl (needed by freedreeno) (RHBZ #1094199) (kwizart) + +* Mon May 05 2014 Igor Gnatenko - 10.2-0.1.rc1.20140505 +- Enable omx on x86 and arm (RHBZ #1094199) (kwizart) +- Split _with_xa from _with_vmware (RHBZ #1094199) (kwizart) +- Add _with_xa when arch is arm and _with_freedreeno (RHBZ #1094199) (kwizart) + +* Mon May 05 2014 Igor Gnatenko - 10.2-0.rc1.20140505 +- 10.2-rc1 upstream release + +* Wed Apr 30 2014 Igor Gnatenko - 10.1.1-3.20140430 +- Update to today snapshot +- apply as downstream patches for reporting GPU max frequency on r600 (FD.o #73511) + +* Sat Apr 19 2014 Igor Gnatenko - 10.1.1-2.20140419 +- fix buildrequires llvm 3.4-5 to 3.4-6, because 3.4-5 is not available for F20 + +* Sat Apr 19 2014 Igor Gnatenko - 10.1.1-1.20140419 +- 10.1.1 upstream release + +* Tue Apr 15 2014 Adam Jackson 10.1-6.20140305 +- Disable DRI3 in F20, it requires libxcb bits we haven't backported. + +* Wed Mar 26 2014 Adam Jackson 10.1-5.20140305 +- Initial ppc64le enablement (no hardware drivers or vdpau yet) + +* Fri Mar 21 2014 Adam Jackson 10.1-4.20140305 +- mesa: Don't optimize out glClear if drawbuffer size is 0x0 (fdo #75797) + +* Wed Mar 19 2014 Dave Airlie 10.1-3.20140305 +- rebuild against backported llvm 3.4-5 for radeonsi GL 3.3 support. + +* Wed Mar 12 2014 Dave Airlie 10.1-2.20140305 +- disable r600 llvm compiler (upstream advice) + +* Wed Mar 05 2014 Igor Gnatenko - 10.1-1.20140305 +- mesa: Bump version to 10.1 (final) (Ian Romanick) +- glx/dri2: fix build failure on HURD (Julien Cristau) +- i965: Validate (and resolve) all the bound textures. (Chris Forbes) +- i965: Widen sampler key bitfields for 32 samplers (Chris Forbes) + +* Sat Mar 01 2014 Igor Gnatenko - 10.1-0.rc3.20140301 +- 10.1-rc3 + +* Tue Feb 25 2014 Igor Gnatenko - 10.1-0.rc2.20140225 +- really 10.1-rc2 + +* Sat Feb 22 2014 Igor Gnatenko - 10.1-0.rc2.20140222 +- 10.1-rc2 + +* Sat Feb 08 2014 Adel Gadllah - 10.1-0.rc1.20140208 +- 10.1rc1 +- Drop upstreamed patches + +* Thu Feb 06 2014 Igor Gnatenko - 10.0.3-1.20140206 +- 10.0.3 upstream release + +* Tue Feb 04 2014 Kyle McMartin - 10.0.2-6.20140118 +- Fix accidentally inverted logic that meant radeonsi_dri.so went missing + on all architectures instead of just ppc and s390. Sorry! + +* Sun Feb 02 2014 Kyle McMartin - 10.0.2-5.20140118 +- Fix a thinko in previous commit wrt libdrm_nouveau2. + +* Sun Feb 02 2014 Kyle McMartin - 10.0.2-4.20140118 +- Fix up building drivers on AArch64, enable LLVM there. +- Eliminate some F17 cruft from the spec, since we don't support it anymore. +- Conditionalize with_radeonsi on with_llvm instead of ppc,s390 && >F-17. +- Conditionalize libvdpau_radeonsi.so.1* on with_radeonsi instead of simply + with_llvm to fix a build failure on AArch64. + +* Sun Jan 19 2014 Igor Gnatenko - 10.0.2-3.20140118 +- Enable OpenCL (RHBZ #887628) +- Enable r600 llvm compiler (RHBZ #1055098)