rpms/mesa
7
0
Fork 1
Code Issues Pull Requests Releases Activity

Merge branch 'c8' into a8

Browse Source
This commit is contained in:
eabdullin 2024-08-14 12:26:45 +03:00
commit ce6207396d
2 changed files with 37 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
SOURCES/0001-mesa-fix-off-by-one-for-newblock-allocation-in-dlist.patch Normal file
View File

@ -0,0 +1,28 @@
From 460d2c46a903fed295a1528c8b6273dd6b0e0d19 Mon Sep 17 00:00:00 2001
From: thfrwn <11335318+rfht@users.noreply.github.com>
Date: Fri, 9 Feb 2024 17:00:55 -0500
Subject: [PATCH] mesa: fix off-by-one for newblock allocation in dlist_alloc
Cc: mesa-stable
Reviewed-by: Pierre-Eric Pelloux-Prayer <pierre-eric.pelloux-prayer@amd.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/27556>
---
src/mesa/main/dlist.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/mesa/main/dlist.c b/src/mesa/main/dlist.c
index b0184a24e20..9213641699a 100644
--- a/src/mesa/main/dlist.c
+++ b/src/mesa/main/dlist.c
@@ -1220,7 +1220,7 @@ dlist_alloc(struct gl_context *ctx, OpCode opcode, GLuint bytes, bool align8)
ctx->ListState.CurrentPos++;
}
- if (ctx->ListState.CurrentPos + numNodes + contNodes > BLOCK_SIZE) {
+ if (ctx->ListState.CurrentPos + numNodes + contNodes >= BLOCK_SIZE) {
/* This block is full. Allocate a new block and chain to it */
Node *newblock;
Node *n = ctx->ListState.CurrentBlock + ctx->ListState.CurrentPos;
--
2.45.2

11
SPECS/mesa.spec
View File

@ -43,7 +43,7 @@
Name: mesa Name: mesa
Summary: Mesa graphics libraries Summary: Mesa graphics libraries
Version: 23.1.4 Version: 23.1.4
Release: 2%{?rctag:.%{rctag}}%{?dist}.alma.1 Release: 3%{?rctag:.%{rctag}}%{?dist}.alma.1
License: MIT License: MIT
URL: http://www.mesa3d.org URL: http://www.mesa3d.org
@ -71,6 +71,9 @@ Patch12: radeonsi-turn-off-glthread.patch
Patch13: 0001-llvmpipe-only-include-old-Transform-includes-when-ne.patch Patch13: 0001-llvmpipe-only-include-old-Transform-includes-when-ne.patch
Patch14: 0001-clover-llvm-move-to-modern-pass-manager.patch Patch14: 0001-clover-llvm-move-to-modern-pass-manager.patch
# https://issues.redhat.com/browse/RHEL-40566
Patch15: 0001-mesa-fix-off-by-one-for-newblock-allocation-in-dlist.patch
BuildRequires: gcc BuildRequires: gcc
BuildRequires: gcc-c++ BuildRequires: gcc-c++
@ -622,10 +625,14 @@ done
%endif %endif
%changelog %changelog
* Tue Jun 25 2024 Koichiro Iwao <meta@almalinux.org> - 23.1.4-2.alma.1 * Wed Aug 14 2024 Koichiro Iwao <meta@almalinux.org> - 23.1.4-3.alma.1
- Enable v3d for Raspberry Pi graphic in AlmaLinux - Enable v3d for Raspberry Pi graphic in AlmaLinux
Resolves: https://github.com/AlmaLinux/raspberry-pi/issues/32 Resolves: https://github.com/AlmaLinux/raspberry-pi/issues/32
* Thu Jun 20 2024 José Expósito <jexposit@redhat.com> - 23.1.4-3
- Fix off-by-one error for newblock allocation in dlist_alloc
Resolves: https://issues.redhat.com/browse/RHEL-40566
* Thu Nov 23 2023 José Expósito <jexposit@redhat.com> - 23.1.4-2 * Thu Nov 23 2023 José Expósito <jexposit@redhat.com> - 23.1.4-2
- Rebuild against LLVM 17 - Rebuild against LLVM 17