francesco/fml13v01-buildroot
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[mesa3d] Sync all patch files with DDK 1.17.

Browse Source
This commit is contained in:
Windsome Zeng
2022-08-16 17:38:05 +08:00
parent 6bfcc5fdc6
commit fe38db9384
70 changed files with 5794 additions and 6452 deletions
Download Patch File Download Diff File Expand all files Collapse all files
package/mesa3d/0046-Separate-EXT_framebuffer_object-from-ARB-version.patch
+39 -39
View File
@@ -1,7 +1,7 @@
From 22afb695d4598a52198f9bbe98b359f9fcf77cfa Mon Sep 17 00:00:00 2001
From ed4671544a6add01e87e94c04df59a600403dd21 Mon Sep 17 00:00:00 2001
From: Brendan King <Brendan.King@imgtec.com>
Date: Mon, 10 Mar 2014 13:43:45 +0000
Subject: [PATCH 47/50] Separate EXT_framebuffer_object from ARB version
Subject: [PATCH 46/67] Separate EXT_framebuffer_object from ARB version
This patch separates the EXT_framebuffer_object entry points from the ARB
equivalents.
@@ -145,36 +145,36 @@ index 6c0e54af1c9..957b6a3a632 100644
</function>
</category>
diff --git a/src/mapi/glapi/gen/static_data.py b/src/mapi/glapi/gen/static_data.py
index 32fb3b8f4f7..ecd650ab814 100644
index e231c176264..974f366d7b4 100644
--- a/src/mapi/glapi/gen/static_data.py
+++ b/src/mapi/glapi/gen/static_data.py
@@ -1694,6 +1694,21 @@ offsets = {
"FramebufferTextureMultisampleMultiviewOVR" : 1658,
"MultiDrawArraysIndirectEXT" : 1659,
"MultiDrawElementsIndirectEXT" : 1660,
+ "IsRenderbufferEXT" : 1661,
+ "DeleteRenderbuffersEXT" : 1662,
+ "GenRenderbuffersEXT" : 1663,
+ "RenderbufferStorageEXT" : 1664,
+ "GetRenderbufferParameterivEXT" : 1665,
+ "IsFramebufferEXT" : 1666,
+ "DeleteFramebuffersEXT" : 1667,
+ "GenFramebuffersEXT" : 1668,
+ "CheckFramebufferStatusEXT" : 1669,
+ "FramebufferTexture1DEXT" : 1670,
+ "FramebufferTexture2DEXT" : 1671,
+ "FramebufferTexture3DEXT" : 1672,
+ "FramebufferRenderbufferEXT" : 1673,
+ "GetFramebufferAttachmentParameterivEXT" : 1674,
+ "GenerateMipmapEXT" : 1675,
@@ -1706,6 +1706,21 @@ offsets = {
"FramebufferTextureMultisampleMultiviewOVR" : 1670,
"MultiDrawArraysIndirectEXT" : 1671,
"MultiDrawElementsIndirectEXT" : 1672,
+ "IsRenderbufferEXT" : 1673,
+ "DeleteRenderbuffersEXT" : 1674,
+ "GenRenderbuffersEXT" : 1675,
+ "RenderbufferStorageEXT" : 1676,
+ "GetRenderbufferParameterivEXT" : 1677,
+ "IsFramebufferEXT" : 1678,
+ "DeleteFramebuffersEXT" : 1679,
+ "GenFramebuffersEXT" : 1680,
+ "CheckFramebufferStatusEXT" : 1681,
+ "FramebufferTexture1DEXT" : 1682,
+ "FramebufferTexture2DEXT" : 1683,
+ "FramebufferTexture3DEXT" : 1684,
+ "FramebufferRenderbufferEXT" : 1685,
+ "GetFramebufferAttachmentParameterivEXT" : 1686,
+ "GenerateMipmapEXT" : 1687,
}
functions = [
diff --git a/src/mesa/main/fbobject.c b/src/mesa/main/fbobject.c
index 798f59d2499..21507ff7c19 100644
index 49893165250..885aa442911 100644
--- a/src/mesa/main/fbobject.c
+++ b/src/mesa/main/fbobject.c
@@ -1973,6 +1973,11 @@ _mesa_detach_renderbuffer(struct gl_context *ctx,
@@ -1995,6 +1995,11 @@ _mesa_detach_renderbuffer(struct gl_context *ctx,
return progress;
}
@@ -186,7 +186,7 @@ index 798f59d2499..21507ff7c19 100644
void GLAPIENTRY
_mesa_DeleteRenderbuffers(GLsizei n, const GLuint *renderbuffers)
@@ -2682,6 +2687,12 @@ renderbuffer_storage_target(GLenum target, GLenum internalFormat,
@@ -2722,6 +2727,12 @@ renderbuffer_storage_target(GLenum target, GLenum internalFormat,
}
@@ -199,7 +199,7 @@ index 798f59d2499..21507ff7c19 100644
void GLAPIENTRY
_mesa_EGLImageTargetRenderbufferStorageOES(GLenum target, GLeglImageOES image)
{
@@ -2712,6 +2723,11 @@ _mesa_EGLImageTargetRenderbufferStorageOES(GLenum target, GLeglImageOES image)
@@ -2752,6 +2763,11 @@ _mesa_EGLImageTargetRenderbufferStorageOES(GLenum target, GLeglImageOES image)
ctx->Driver.EGLImageTargetRenderbufferStorage(ctx, rb, image);
}
@@ -211,7 +211,7 @@ index 798f59d2499..21507ff7c19 100644
/**
* Helper function for _mesa_GetRenderbufferParameteriv() and
@@ -2744,6 +2760,12 @@ _mesa_RenderbufferStorage(GLenum target, GLenum internalFormat,
@@ -2784,6 +2800,12 @@ _mesa_RenderbufferStorage(GLenum target, GLenum internalFormat,
NO_SAMPLES, 0, "glRenderbufferStorage");
}
@@ -224,7 +224,7 @@ index 798f59d2499..21507ff7c19 100644
void GLAPIENTRY
_mesa_RenderbufferStorageMultisample(GLenum target, GLsizei samples,
@@ -2945,6 +2967,11 @@ _mesa_GetNamedRenderbufferParameteriv(GLuint renderbuffer, GLenum pname,
@@ -2985,6 +3007,11 @@ _mesa_GetNamedRenderbufferParameteriv(GLuint renderbuffer, GLenum pname,
"glGetNamedRenderbufferParameteriv");
}
@@ -236,7 +236,7 @@ index 798f59d2499..21507ff7c19 100644
void GLAPIENTRY
_mesa_GetNamedRenderbufferParameterivEXT(GLuint renderbuffer, GLenum pname,
@@ -2978,6 +3005,11 @@ _mesa_IsFramebuffer(GLuint framebuffer)
@@ -3018,6 +3045,11 @@ _mesa_IsFramebuffer(GLuint framebuffer)
return GL_FALSE;
}
@@ -248,7 +248,7 @@ index 798f59d2499..21507ff7c19 100644
/**
* Check if any of the attachments of the given framebuffer are textures
@@ -3212,6 +3244,11 @@ _mesa_DeleteFramebuffers(GLsizei n, const GLuint *framebuffers)
@@ -3253,6 +3285,11 @@ _mesa_DeleteFramebuffers(GLsizei n, const GLuint *framebuffers)
}
}
@@ -260,7 +260,7 @@ index 798f59d2499..21507ff7c19 100644
/**
* This is the implementation for glGenFramebuffers and glCreateFramebuffers.
@@ -3258,6 +3295,11 @@ create_framebuffers(GLsizei n, GLuint *framebuffers, bool dsa)
@@ -3299,6 +3336,11 @@ create_framebuffers(GLsizei n, GLuint *framebuffers, bool dsa)
_mesa_HashUnlockMutex(ctx->Shared->FrameBuffers);
}
@@ -272,7 +272,7 @@ index 798f59d2499..21507ff7c19 100644
void GLAPIENTRY
_mesa_GenFramebuffers(GLsizei n, GLuint *framebuffers)
@@ -3297,6 +3339,11 @@ _mesa_check_framebuffer_status(struct gl_context *ctx,
@@ -3338,6 +3380,11 @@ _mesa_check_framebuffer_status(struct gl_context *ctx,
return buffer->_Status;
}
@@ -284,7 +284,7 @@ index 798f59d2499..21507ff7c19 100644
GLenum GLAPIENTRY
_mesa_CheckFramebufferStatus_no_error(GLenum target)
@@ -3909,6 +3956,12 @@ _mesa_FramebufferTexture1D_no_error(GLenum target, GLenum attachment,
@@ -3950,6 +3997,12 @@ _mesa_FramebufferTexture1D_no_error(GLenum target, GLenum attachment,
texture, level, 0);
}
@@ -297,7 +297,7 @@ index 798f59d2499..21507ff7c19 100644
void GLAPIENTRY
_mesa_FramebufferTexture1D(GLenum target, GLenum attachment,
@@ -3949,6 +4002,12 @@ _mesa_FramebufferTexture2DMultisampleEXT(GLenum target, GLenum attachment,
@@ -3990,6 +4043,12 @@ _mesa_FramebufferTexture2DMultisampleEXT(GLenum target, GLenum attachment,
false);
}
@@ -310,7 +310,7 @@ index 798f59d2499..21507ff7c19 100644
void GLAPIENTRY
_mesa_FramebufferTexture3D_no_error(GLenum target, GLenum attachment,
@@ -4059,6 +4118,15 @@ frame_buffer_texture(GLuint framebuffer, GLenum target,
@@ -4100,6 +4159,15 @@ frame_buffer_texture(GLuint framebuffer, GLenum target,
level, 0, layer, layered);
}
@@ -326,7 +326,7 @@ index 798f59d2499..21507ff7c19 100644
void GLAPIENTRY
_mesa_FramebufferTextureLayer_no_error(GLenum target, GLenum attachment,
GLuint texture, GLint level,
@@ -4312,6 +4380,15 @@ _mesa_FramebufferRenderbuffer(GLenum target, GLenum attachment,
@@ -4353,6 +4421,15 @@ _mesa_FramebufferRenderbuffer(GLenum target, GLenum attachment,
renderbuffer, "glFramebufferRenderbuffer");
}
@@ -342,7 +342,7 @@ index 798f59d2499..21507ff7c19 100644
void GLAPIENTRY
_mesa_NamedFramebufferRenderbuffer_no_error(GLuint framebuffer,
GLenum attachment,
@@ -4713,6 +4790,12 @@ invalid_pname_enum:
@@ -4754,6 +4831,12 @@ invalid_pname_enum:
return;
}
@@ -507,7 +507,7 @@ index 2a32c158e68..98271d76f50 100644
_mesa_InvalidateSubFramebuffer(GLenum target, GLsizei numAttachments,
const GLenum *attachments, GLint x, GLint y,
diff --git a/src/mesa/main/genmipmap.c b/src/mesa/main/genmipmap.c
index 16e2b037635..4d7b7db36a5 100644
index 36727bb7060..8d262e53852 100644
--- a/src/mesa/main/genmipmap.c
+++ b/src/mesa/main/genmipmap.c
@@ -267,3 +267,9 @@ _mesa_GenerateMultiTexMipmapEXT(GLenum texunit, GLenum target)
@@ -535,5 +535,5 @@ index c661f2184c7..ff3b45a4417 100644
_mesa_GenerateTextureMipmap(GLuint texture);
--
2.17.1
2.25.1