Skip to content

Commit 48588bd

Browse files
Mohan MaiyaCommit Bot
Mohan Maiya
authored and
Commit Bot
committed
Vulkan: Add GL_EXT_buffer_storage extension entry points
Addition of just the entry points for GL_EXT_buffer_storage extension. Bug: angleproject:5056 Change-Id: I7a3d7c151f004f89fd945d5d06dbe7afcd491578 Reviewed-on: https://chromium-review.googlesource.com/c/angle/angle/+/2419951 Commit-Queue: Mohan Maiya <m.maiya@samsung.com> Reviewed-by: Shahbaz Youssefi <syoussefi@chromium.org> Reviewed-by: Jamie Madill <jmadill@chromium.org>
1 parent de335c1 commit 48588bd

35 files changed

+284
-40
lines changed

‎include/GLES2/gl2ext_explicit_context_autogen.inc‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -163,6 +163,7 @@ typedef void (GL_APIENTRYP PFNGLBLENDFUNCSEPARATEIOESCONTEXTANGLEPROC)(GLeglCont
163163
typedef void (GL_APIENTRYP PFNGLBLENDFUNCIEXTCONTEXTANGLEPROC)(GLeglContext ctx, GLuint buf, GLenum src, GLenum dst);
164164
typedef void (GL_APIENTRYP PFNGLBLENDFUNCIOESCONTEXTANGLEPROC)(GLeglContext ctx, GLuint buf, GLenum src, GLenum dst);
165165
typedef void (GL_APIENTRYP PFNGLBLITFRAMEBUFFERANGLECONTEXTANGLEPROC)(GLeglContext ctx, GLint srcX0, GLint srcY0, GLint srcX1, GLint srcY1, GLint dstX0, GLint dstY0, GLint dstX1, GLint dstY1, GLbitfield mask, GLenum filter);
166+
typedef void (GL_APIENTRYP PFNGLBUFFERSTORAGEEXTCONTEXTANGLEPROC)(GLeglContext ctx, GLenum target, GLsizeiptr size, const void *data, GLbitfield flags);
166167
typedef void (GL_APIENTRYP PFNGLBUFFERSTORAGEMEMEXTCONTEXTANGLEPROC)(GLeglContext ctx, GLenum target, GLsizeiptr size, GLuint memory, GLuint64 offset);
167168
typedef void (GL_APIENTRYP PFNGLCOLORMASKIEXTCONTEXTANGLEPROC)(GLeglContext ctx, GLuint index, GLboolean r, GLboolean g, GLboolean b, GLboolean a);
168169
typedef void (GL_APIENTRYP PFNGLCOLORMASKIOESCONTEXTANGLEPROC)(GLeglContext ctx, GLuint index, GLboolean r, GLboolean g, GLboolean b, GLboolean a);
@@ -540,6 +541,7 @@ GL_APICALL void GL_APIENTRY glBlendFuncSeparateiOESContextANGLE(GLeglContext ctx
540541
GL_APICALL void GL_APIENTRY glBlendFunciEXTContextANGLE(GLeglContext ctx, GLuint buf, GLenum src, GLenum dst);
541542
GL_APICALL void GL_APIENTRY glBlendFunciOESContextANGLE(GLeglContext ctx, GLuint buf, GLenum src, GLenum dst);
542543
GL_APICALL void GL_APIENTRY glBlitFramebufferANGLEContextANGLE(GLeglContext ctx, GLint srcX0, GLint srcY0, GLint srcX1, GLint srcY1, GLint dstX0, GLint dstY0, GLint dstX1, GLint dstY1, GLbitfield mask, GLenum filter);
544+
GL_APICALL void GL_APIENTRY glBufferStorageEXTContextANGLE(GLeglContext ctx, GLenum target, GLsizeiptr size, const void *data, GLbitfield flags);
543545
GL_APICALL void GL_APIENTRY glBufferStorageMemEXTContextANGLE(GLeglContext ctx, GLenum target, GLsizeiptr size, GLuint memory, GLuint64 offset);
544546
GL_APICALL void GL_APIENTRY glColorMaskiEXTContextANGLE(GLeglContext ctx, GLuint index, GLboolean r, GLboolean g, GLboolean b, GLboolean a);
545547
GL_APICALL void GL_APIENTRY glColorMaskiOESContextANGLE(GLeglContext ctx, GLuint index, GLboolean r, GLboolean g, GLboolean b, GLboolean a);

‎scripts/code_generation_hashes/GL_EGL_WGL_loader.json‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
"scripts/gl_angle_ext.xml":
1111
"5b91263f1099308e4e75f89d85be564e",
1212
"scripts/registry_xml.py":
13-
"9fb89d0ee43040ddf1aa5899abfca7af",
13+
"f39392222a1bcdbda197c0bf9d8f129c",
1414
"scripts/wgl.xml":
1515
"aa96419c582af2f6673430e2847693f4",
1616
"src/libEGL/egl_loader_autogen.cpp":
@@ -22,17 +22,17 @@
2222
"src/tests/restricted_traces/trace_egl_loader_autogen.h":
2323
"af2eb06cc8de3456b7bfde497b04c0c4",
2424
"src/tests/restricted_traces/trace_gles_loader_autogen.cpp":
25-
"f989f0d3e94d1ae985cfc9514cea8d48",
25+
"042b15665e979a934595f1a01dad0a1a",
2626
"src/tests/restricted_traces/trace_gles_loader_autogen.h":
27-
"90da6d113a8248e148bf3a3853192292",
27+
"27b0c9d7536604047c0795aa03a16b8d",
2828
"util/egl_loader_autogen.cpp":
2929
"e10da66fdf789e6c52dee1f9e1cd5a68",
3030
"util/egl_loader_autogen.h":
3131
"5e2ac71185c91139c6768adf8615b3c7",
3232
"util/gles_loader_autogen.cpp":
33-
"4fb108c57db72c07d72883ec7c9e2286",
33+
"1f0bf4b10f18d59bc5d0d556aa0aaebb",
3434
"util/gles_loader_autogen.h":
35-
"cbe9fd9955c93090ffe584aab4f95639",
35+
"8a8ef0e937a3d27732aee63a8ac6d780",
3636
"util/windows/wgl_loader_autogen.cpp":
3737
"60a40fba3ffddd40063fe6131bc67ba5",
3838
"util/windows/wgl_loader_autogen.h":

‎scripts/code_generation_hashes/GL_EGL_entry_points.json‎

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -4,15 +4,15 @@
44
"scripts/egl_angle_ext.xml":
55
"087d6a3996a91fbb0b664cac57c50c4c",
66
"scripts/entry_point_packed_gl_enums.json":
7-
"776bf87905f92e8bc21abfceb2ccf723",
7+
"2d46a38023361f8e95af71042626667c",
88
"scripts/generate_entry_points.py":
99
"97af17f666be77934b2d54d3b66746f7",
1010
"scripts/gl.xml":
1111
"e74a595068cbdd6064300be1e71b7cc9",
1212
"scripts/gl_angle_ext.xml":
1313
"5b91263f1099308e4e75f89d85be564e",
1414
"scripts/registry_xml.py":
15-
"9fb89d0ee43040ddf1aa5899abfca7af",
15+
"f39392222a1bcdbda197c0bf9d8f129c",
1616
"scripts/wgl.xml":
1717
"aa96419c582af2f6673430e2847693f4",
1818
"src/libANGLE/Context_gl_1_0_autogen.h":
@@ -48,7 +48,7 @@
4848
"src/libANGLE/Context_gl_4_3_autogen.h":
4949
"fbc402c961d759be5e221a84a9cb5d65",
5050
"src/libANGLE/Context_gl_4_4_autogen.h":
51-
"27b04d8d3b1f7a2804d49b85627e78a9",
51+
"f723877386ca9277ac4acea820a0d7f1",
5252
"src/libANGLE/Context_gl_4_5_autogen.h":
5353
"f06e102c161b2804caaa943027f157ad",
5454
"src/libANGLE/Context_gl_4_6_autogen.h":
@@ -64,7 +64,7 @@
6464
"src/libANGLE/Context_gles_3_2_autogen.h":
6565
"48567dca16fd881dfe6d61fee0e3106f",
6666
"src/libANGLE/Context_gles_ext_autogen.h":
67-
"65ef040de0776d6a6f0a300d14b96920",
67+
"717aad3984444d78922a7453ecb16111",
6868
"src/libANGLE/capture_gles_1_0_autogen.cpp":
6969
"1ee3e4aceb1afa9585aa458c600665a9",
7070
"src/libANGLE/capture_gles_1_0_autogen.h":
@@ -86,15 +86,15 @@
8686
"src/libANGLE/capture_gles_3_2_autogen.h":
8787
"3d8f561944c8e5c06c7c9e68559ff364",
8888
"src/libANGLE/capture_gles_ext_autogen.cpp":
89-
"a392c54277ac3f609ea31095fe690287",
89+
"701406c4e0704c416e3577fa2766de2b",
9090
"src/libANGLE/capture_gles_ext_autogen.h":
91-
"39ba68d335d2a9b1227229c644d8acd1",
91+
"67481484bb4f9ce9a52fb48e06166856",
9292
"src/libANGLE/entry_points_enum_autogen.cpp":
93-
"56e4b6b6fa81c4044aa6f78840989c23",
93+
"6eba92f7df9d0896ed6e6e633704ad2d",
9494
"src/libANGLE/entry_points_enum_autogen.h":
95-
"023b6a1438d11469cb7ea083a840adab",
95+
"5bfe6a82d530ef5ff020239e24dbfb57",
9696
"src/libANGLE/frame_capture_replay_autogen.cpp":
97-
"7be11c0f9df0cb3130ffe2c47e6ea9fb",
97+
"09901bfdd8b16c9e888380179b53aa7a",
9898
"src/libANGLE/frame_capture_utils_autogen.cpp":
9999
"7a4f16a96714e43faaa0bef299ad7028",
100100
"src/libANGLE/frame_capture_utils_autogen.h":
@@ -110,7 +110,7 @@
110110
"src/libANGLE/validationES3_autogen.h":
111111
"86ba503835328438158d9a464943f3bd",
112112
"src/libANGLE/validationESEXT_autogen.h":
113-
"1df35b2a44339242296f284389058b9a",
113+
"d68c0dc4a6102a6408ad25e2bed3448a",
114114
"src/libANGLE/validationGL11_autogen.h":
115115
"aadd145c1404de9c34d6b7c00404f10f",
116116
"src/libANGLE/validationGL12_autogen.h":
@@ -142,7 +142,7 @@
142142
"src/libANGLE/validationGL43_autogen.h":
143143
"0d05f9873cb5c65b0c68a60423e9c724",
144144
"src/libANGLE/validationGL44_autogen.h":
145-
"ee89bec1bf4eab31b3b653c0f1a88d33",
145+
"658f2758447628218db4547a27210b0e",
146146
"src/libANGLE/validationGL45_autogen.h":
147147
"a0af5104f0d3949c9d945387d11e6302",
148148
"src/libANGLE/validationGL46_autogen.h":
@@ -214,7 +214,7 @@
214214
"src/libGL/entry_points_gl_4_3_autogen.h":
215215
"abfa431742a2b643db21220944e10ab0",
216216
"src/libGL/entry_points_gl_4_4_autogen.cpp":
217-
"cb8e53abee5240a9b21261ece4245344",
217+
"69d079ef40f34737be2da2573a668091",
218218
"src/libGL/entry_points_gl_4_4_autogen.h":
219219
"cdf1651f00d26db547b153afc09acc1c",
220220
"src/libGL/entry_points_gl_4_5_autogen.cpp":
@@ -250,15 +250,15 @@
250250
"src/libGLESv2/entry_points_gles_3_2_autogen.h":
251251
"5798aa0a73af1d4ba5dfe99b6217a247",
252252
"src/libGLESv2/entry_points_gles_ext_autogen.cpp":
253-
"39b7046fe133bf53363f94047c1e397c",
253+
"9faa56624ca8c85dc8e5fc7d4f6af381",
254254
"src/libGLESv2/entry_points_gles_ext_autogen.h":
255-
"cd61ad92a58edf34dfd2fa09e612edf5",
255+
"43e410ee4628e3e93829ef740bd4c67f",
256256
"src/libGLESv2/libGLESv2_autogen.cpp":
257-
"980929401e0c450b481ff9e5f91ced41",
257+
"b498a6388981bf327ac8169d8485ca95",
258258
"src/libGLESv2/libGLESv2_autogen.def":
259-
"0b5301a0cfda69c876cc88563883199a",
259+
"bf06958fbb48dcad516f05fa74ed6efb",
260260
"src/libGLESv2/libGLESv2_no_capture_autogen.def":
261-
"0a8cf9e24d7caf60e103e91ff7cd7bbe",
261+
"4b48ee13fc6ed21a850b4526053488e0",
262262
"src/libGLESv2/libGLESv2_with_capture_autogen.def":
263-
"78c3ebee64c4ff3e278a8c8abb802218"
263+
"cae3c752aaffac1ccf94b5c1d3c9035b"
264264
}

‎scripts/code_generation_hashes/GLenum_value_to_string_map.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,9 @@
66
"scripts/gl_angle_ext.xml":
77
"5b91263f1099308e4e75f89d85be564e",
88
"scripts/registry_xml.py":
9-
"9fb89d0ee43040ddf1aa5899abfca7af",
9+
"f39392222a1bcdbda197c0bf9d8f129c",
1010
"src/libANGLE/gl_enum_utils_autogen.cpp":
11-
"adc5a5fa540a850ab15e563477cafc47",
11+
"63c23d06152729e045b6be6ea814f0d9",
1212
"src/libANGLE/gl_enum_utils_autogen.h":
1313
"dd54f34be733affcb994fc315c3b972d"
1414
}

‎scripts/code_generation_hashes/proc_table.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,11 +10,11 @@
1010
"scripts/gl_angle_ext.xml":
1111
"5b91263f1099308e4e75f89d85be564e",
1212
"scripts/registry_xml.py":
13-
"9fb89d0ee43040ddf1aa5899abfca7af",
13+
"f39392222a1bcdbda197c0bf9d8f129c",
1414
"scripts/wgl.xml":
1515
"aa96419c582af2f6673430e2847693f4",
1616
"src/libGL/proc_table_wgl_autogen.cpp":
1717
"253f59ef3aa9ccfcab1364ae5101dbe2",
1818
"src/libGLESv2/proc_table_egl_autogen.cpp":
19-
"32466f80e116effea6793b04ffdbac8d"
19+
"829888d1aae6ad492614581f0e88b4b0"
2020
}

‎scripts/entry_point_packed_gl_enums.json‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -105,6 +105,9 @@
105105
"target": "BufferBinding",
106106
"usage": "BufferUsage"
107107
},
108+
"glBufferStorage": {
109+
"target": "BufferBinding"
110+
},
108111
"glBufferStorageMem": {
109112
"memory": "MemoryObjectID",
110113
"target": "TextureType"
@@ -1066,7 +1069,8 @@
10661069
"buffer": "BufferID"
10671070
},
10681071
"glNamedBufferStorage": {
1069-
"buffer": "BufferID"
1072+
"buffer": "BufferID",
1073+
"target": "BufferBinding"
10701074
},
10711075
"glNamedBufferSubData": {
10721076
"buffer": "BufferID"

‎scripts/registry_xml.py‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -63,6 +63,7 @@
6363
"GL_ANGLE_texture_multisample",
6464
"GL_ANGLE_translated_shader_source",
6565
"GL_EXT_blend_func_extended",
66+
"GL_EXT_buffer_storage",
6667
"GL_EXT_debug_marker",
6768
"GL_EXT_discard_framebuffer",
6869
"GL_EXT_disjoint_timer_query",

‎src/libANGLE/Caps.h‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -644,6 +644,9 @@ struct Extensions
644644

645645
// GL_EXT_shadow_samplers
646646
bool shadowSamplersEXT = false;
647+
648+
// GL_EXT_buffer_storage
649+
bool bufferStorageEXT = false;
647650
};
648651

649652
// Pointer to a boolean memeber of the Extensions struct

‎src/libANGLE/Context.cpp‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5430,6 +5430,14 @@ void Context::primitiveBoundingBox(GLfloat minX,
54305430
UNIMPLEMENTED();
54315431
}
54325432

5433+
void Context::bufferStorage(BufferBinding target,
5434+
GLsizeiptr size,
5435+
const void *data,
5436+
GLbitfield flags)
5437+
{
5438+
UNIMPLEMENTED();
5439+
}
5440+
54335441
void Context::bufferData(BufferBinding target, GLsizeiptr size, const void *data, BufferUsage usage)
54345442
{
54355443
Buffer *buffer = mState.getTargetBuffer(target);

‎src/libANGLE/Context_gl.cpp‎

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2831,11 +2831,6 @@ void Context::bindVertexBuffers(GLuint first,
28312831
UNIMPLEMENTED();
28322832
}
28332833

2834-
void Context::bufferStorage(GLenum target, GLsizeiptr size, const void *data, GLbitfield flags)
2835-
{
2836-
UNIMPLEMENTED();
2837-
}
2838-
28392834
void Context::clearTexImage(TextureID texture,
28402835
GLint level,
28412836
GLenum format,

0 commit comments

Comments
 (0)