This entry point is specifically for retrieving very large timestamp
values from EXT_disjoint_time_query. In GLES 2.0 contexts with the
Vulkan back-end we were getting some astronomical values that couldn't
be cast to 32-bit ints.

Also fix missing dependencies in generate_loader.py.

Bug: angleproject:4433
Change-Id: I59146dcc1a163a24ac2d7c37546f4551a7a8890a
Reviewed-on: https://chromium-review.googlesource.com/c/angle/angle/+/2080595
Commit-Queue: Jamie Madill <jmadill@chromium.org>
Reviewed-by: Cody Northrop <cnorthrop@google.com>
This commit is contained in:
Jamie Madill 2020-02-28 15:05:41 -05:00 коммит произвёл Commit Bot
Родитель 51a9da21ff
Коммит 80f55e9742
25 изменённых файлов: 166 добавлений и 21 удалений

Просмотреть файл

@ -212,6 +212,7 @@ typedef GLuint (GL_APIENTRYP PFNGLGETDEBUGMESSAGELOGKHRCONTEXTANGLEPROC)(GLeglCo
typedef void (GL_APIENTRYP PFNGLGETFENCEIVNVCONTEXTANGLEPROC)(GLeglContext ctx, GLuint fence, GLenum pname, GLint *params);
typedef GLint (GL_APIENTRYP PFNGLGETFRAGDATAINDEXEXTCONTEXTANGLEPROC)(GLeglContext ctx, GLuint program, const GLchar *name);
typedef GLenum (GL_APIENTRYP PFNGLGETGRAPHICSRESETSTATUSEXTCONTEXTANGLEPROC)(GLeglContext ctx);
typedef void (GL_APIENTRYP PFNGLGETINTEGER64VEXTCONTEXTANGLEPROC)(GLeglContext ctx, GLenum pname, GLint64 *data);
typedef void (GL_APIENTRYP PFNGLGETMEMORYOBJECTPARAMETERIVEXTCONTEXTANGLEPROC)(GLeglContext ctx, GLuint memoryObject, GLenum pname, GLint *params);
typedef void (GL_APIENTRYP PFNGLGETOBJECTLABELKHRCONTEXTANGLEPROC)(GLeglContext ctx, GLenum identifier, GLuint name, GLsizei bufSize, GLsizei *length, GLchar *label);
typedef void (GL_APIENTRYP PFNGLGETOBJECTPTRLABELKHRCONTEXTANGLEPROC)(GLeglContext ctx, const void *ptr, GLsizei bufSize, GLsizei *length, GLchar *label);
@ -605,6 +606,7 @@ GL_APICALL GLuint GL_APIENTRY glGetDebugMessageLogKHRContextANGLE(GLeglContext c
GL_APICALL void GL_APIENTRY glGetFenceivNVContextANGLE(GLeglContext ctx, GLuint fence, GLenum pname, GLint *params);
GL_APICALL GLint GL_APIENTRY glGetFragDataIndexEXTContextANGLE(GLeglContext ctx, GLuint program, const GLchar *name);
GL_APICALL GLenum GL_APIENTRY glGetGraphicsResetStatusEXTContextANGLE(GLeglContext ctx);
GL_APICALL void GL_APIENTRY glGetInteger64vEXTContextANGLE(GLeglContext ctx, GLenum pname, GLint64 *data);
GL_APICALL void GL_APIENTRY glGetMemoryObjectParameterivEXTContextANGLE(GLeglContext ctx, GLuint memoryObject, GLenum pname, GLint *params);
GL_APICALL void GL_APIENTRY glGetObjectLabelKHRContextANGLE(GLeglContext ctx, GLenum identifier, GLuint name, GLsizei bufSize, GLsizei *length, GLchar *label);
GL_APICALL void GL_APIENTRY glGetObjectPtrLabelKHRContextANGLE(GLeglContext ctx, const void *ptr, GLsizei bufSize, GLsizei *length, GLchar *label);

Просмотреть файл

@ -4,7 +4,11 @@
"scripts/egl_angle_ext.xml":
"63f18dc9b7183ead4ddd3dfd1571973a",
"scripts/generate_loader.py":
"48c60c668bec42a80378179aae2acc61",
"792c41d7ae93a4518f0c73e45626d19b",
"scripts/gl.xml":
"e74a595068cbdd6064300be1e71b7cc9",
"scripts/gl_angle_ext.xml":
"872ecabf7ca7767c7801ba835ddbd1eb",
"scripts/registry_xml.py":
"06c837b395c8cd0c4fc937b193365042",
"scripts/wgl.xml":
@ -18,9 +22,9 @@
"util/egl_loader_autogen.h":
"55b54071e61b3e7beab28178dc20fd28",
"util/gles_loader_autogen.cpp":
"919acbcf2ad24f5e080568e0822084ab",
"1eeaa7649d906a8ff5d8a7889f983071",
"util/gles_loader_autogen.h":
"834466280040f6110e0fb394bcfb1e42",
"1605f0b90bb32b01ccd2470db574cdf6",
"util/windows/wgl_loader_autogen.cpp":
"c0d9a65eaa9aac356c6fd3f88638d2be",
"util/windows/wgl_loader_autogen.h":

Просмотреть файл

@ -8,7 +8,7 @@
"scripts/generate_entry_points.py":
"e12540094b7f57778de97b05c16d2e28",
"scripts/gl.xml":
"2af7b077ec347349b3a92683e8fb8b03",
"e74a595068cbdd6064300be1e71b7cc9",
"scripts/gl_angle_ext.xml":
"872ecabf7ca7767c7801ba835ddbd1eb",
"scripts/registry_xml.py":
@ -86,13 +86,13 @@
"src/libANGLE/capture_gles_3_2_autogen.h":
"2fbca7168541c2e9ff8a055c256f8531",
"src/libANGLE/capture_gles_ext_autogen.cpp":
"cfe15b1611dd9f9ee4d8f269ae060980",
"a98b5bb10ecf372e6e269e29d74ea47b",
"src/libANGLE/capture_gles_ext_autogen.h":
"166e8203c8c07cf7536a28aecc678266",
"f051219bf14f07e0dad99362570db4c1",
"src/libANGLE/entry_points_enum_autogen.cpp":
"51278d203e18d11b73d72a7488035b55",
"e2f6704ac7f7bec6ca042b4e9dfd3f6e",
"src/libANGLE/entry_points_enum_autogen.h":
"af0543f9f2fd8fc582629d65dab71e89",
"20e8b2073f2fcc6d06030cd3488180ac",
"src/libANGLE/frame_capture_replay_autogen.cpp":
"c0d57704c21e0032a486a6195ddb87e4",
"src/libANGLE/frame_capture_utils_autogen.cpp":
@ -110,7 +110,7 @@
"src/libANGLE/validationES3_autogen.h":
"86ba503835328438158d9a464943f3bd",
"src/libANGLE/validationESEXT_autogen.h":
"e5bf1f86fe0530f353db5cd71176cde2",
"791c9d4c47d43a8a66b1eb8e8de785fb",
"src/libANGLE/validationGL11_autogen.h":
"aadd145c1404de9c34d6b7c00404f10f",
"src/libANGLE/validationGL12_autogen.h":
@ -250,15 +250,15 @@
"src/libGLESv2/entry_points_gles_3_2_autogen.h":
"5798aa0a73af1d4ba5dfe99b6217a247",
"src/libGLESv2/entry_points_gles_ext_autogen.cpp":
"45a14fc2bf8ff2a2086251f823b72a9d",
"1151ad20de418b5d06d20e21e6c0bcc8",
"src/libGLESv2/entry_points_gles_ext_autogen.h":
"4e79b0871b83ed48462ebfadbd996b7d",
"d79b251c643deed5f26b5768f1af2a50",
"src/libGLESv2/libGLESv2_autogen.cpp":
"518bc4a1f07b203940b2f4450d1ccd0e",
"e4c15c09605f1e83452f73b943a9d7d4",
"src/libGLESv2/libGLESv2_autogen.def":
"1453a200bbb128967197d71ef2482298",
"e7d40f9f0e47cfcd0e90900a4d279d6c",
"src/libGLESv2/libGLESv2_no_capture_autogen.def":
"d2ea148f7ce199408ec0ae4e2c92ddb9",
"bd298c16f94e5b259c92bfb5ffa3991d",
"src/libGLESv2/libGLESv2_with_capture_autogen.def":
"a6b7e119532a10458d4f44dbaac43655"
"3cd12ebdc7f21923c6f2357f94a13348"
}

Просмотреть файл

@ -2,7 +2,7 @@
"scripts/gen_gl_enum_utils.py":
"f25cdc74b57d10a1cbc4194a72e971af",
"scripts/gl.xml":
"2af7b077ec347349b3a92683e8fb8b03",
"e74a595068cbdd6064300be1e71b7cc9",
"scripts/gl_angle_ext.xml":
"872ecabf7ca7767c7801ba835ddbd1eb",
"scripts/registry_xml.py":

Просмотреть файл

@ -1,10 +1,10 @@
{
"scripts/gl.xml":
"2af7b077ec347349b3a92683e8fb8b03",
"e74a595068cbdd6064300be1e71b7cc9",
"src/libANGLE/renderer/angle_format.py":
"32ba71942c0fd00e6807104f1bb80a3c",
"src/libANGLE/renderer/gl/DispatchTableGL_autogen.cpp":
"96ce3c7c5ad179d7893017770354ce51",
"a791d8035d16b98b6e139a159968117c",
"src/libANGLE/renderer/gl/DispatchTableGL_autogen.h":
"175946b4d8e0e7ce161f97a2244c1283",
"src/libANGLE/renderer/gl/generate_gl_dispatch_table.py":

Просмотреть файл

@ -6,7 +6,7 @@
"scripts/gen_proc_table.py":
"24dbcc78fd3f000f58ca98237ccc0da4",
"scripts/gl.xml":
"2af7b077ec347349b3a92683e8fb8b03",
"e74a595068cbdd6064300be1e71b7cc9",
"scripts/gl_angle_ext.xml":
"872ecabf7ca7767c7801ba835ddbd1eb",
"scripts/registry_xml.py":
@ -16,5 +16,5 @@
"src/libGL/proc_table_wgl_autogen.cpp":
"03c05f20c57c1de822b0ddaf6d4f9607",
"src/libGLESv2/proc_table_egl_autogen.cpp":
"4b576066b0915f136df5479dbcef0852"
"29dbd578aeded8fb3412ab2adc3a1cde"
}

Просмотреть файл

@ -190,6 +190,8 @@ def main():
# Handle inputs/outputs for run_code_generation.py's auto_script
if len(sys.argv) > 1:
inputs = [
'gl.xml',
'gl_angle_ext.xml',
'egl.xml',
'egl_angle_ext.xml',
'registry_xml.py',

Просмотреть файл

@ -16771,6 +16771,12 @@ typedef unsigned int GLhandleARB;
<alias name="glGetIntegeri_v"/>
<glx type="single" opcode="211"/>
</command>
<command>
<proto>void <name>glGetInteger64vEXT</name></proto>
<param group="GetPName"><ptype>GLenum</ptype> <name>pname</name></param>
<param len="COMPSIZE(pname)"><ptype>GLint64</ptype> *<name>data</name></param>
<alias name="glGetInteger64v"/>
</command>
<command>
<proto>void <name>glGetIntegeri_v</name></proto>
<param group="TypeEnum"><ptype>GLenum</ptype> <name>target</name></param>
@ -43341,6 +43347,7 @@ typedef unsigned int GLhandleARB;
<command name="glGetQueryObjectuivEXT"/>
<command name="glGetQueryObjecti64vEXT"/>
<command name="glGetQueryObjectui64vEXT"/>
<command name="glGetInteger64vEXT"/>
</require>
</extension>
<extension name="GL_EXT_draw_buffers" supported="gles2">

Просмотреть файл

@ -3585,6 +3585,23 @@ CallCapture CaptureGenQueriesEXT(const State &glState,
return CallCapture(gl::EntryPoint::GenQueriesEXT, std::move(paramBuffer));
}
CallCapture CaptureGetInteger64vEXT(const State &glState,
bool isCallValid,
GLenum pname,
GLint64 *data)
{
ParamBuffer paramBuffer;
paramBuffer.addEnumParam("pname", GLenumGroup::GetPName, ParamType::TGLenum, pname);
ParamCapture dataParam("data", ParamType::TGLint64Pointer);
InitParamValue(ParamType::TGLint64Pointer, data, &dataParam.value);
CaptureGetInteger64vEXT_data(glState, isCallValid, pname, data, &dataParam);
paramBuffer.addParam(std::move(dataParam));
return CallCapture(gl::EntryPoint::GetInteger64vEXT, std::move(paramBuffer));
}
CallCapture CaptureGetQueryObjecti64vEXT(const State &glState,
bool isCallValid,
QueryID idPacked,

Просмотреть файл

@ -1029,6 +1029,10 @@ angle::CallCapture CaptureGenQueriesEXT(const State &glState,
bool isCallValid,
GLsizei n,
QueryID *idsPacked);
angle::CallCapture CaptureGetInteger64vEXT(const State &glState,
bool isCallValid,
GLenum pname,
GLint64 *data);
angle::CallCapture CaptureGetQueryObjecti64vEXT(const State &glState,
bool isCallValid,
QueryID idPacked,
@ -3481,6 +3485,11 @@ void CaptureGenQueriesEXT_idsPacked(const State &glState,
GLsizei n,
QueryID *idsPacked,
angle::ParamCapture *paramCapture);
void CaptureGetInteger64vEXT_data(const State &glState,
bool isCallValid,
GLenum pname,
GLint64 *data,
angle::ParamCapture *paramCapture);
void CaptureGetQueryObjecti64vEXT_params(const State &glState,
bool isCallValid,
QueryID idPacked,

Просмотреть файл

@ -2326,6 +2326,15 @@ void CaptureGetQueryObjecti64vEXT_params(const State &glState,
UNIMPLEMENTED();
}
void CaptureGetInteger64vEXT_data(const State &glState,
bool isCallValid,
GLenum pname,
GLint64 *data,
angle::ParamCapture *paramCapture)
{
UNIMPLEMENTED();
}
void CaptureGetQueryObjectivEXT_params(const State &glState,
bool isCallValid,
QueryID id,

Просмотреть файл

@ -876,6 +876,8 @@ const char *GetEntryPointName(EntryPoint ep)
return "glGetInteger64i_vRobustANGLE";
case EntryPoint::GetInteger64v:
return "glGetInteger64v";
case EntryPoint::GetInteger64vEXT:
return "glGetInteger64vEXT";
case EntryPoint::GetInteger64vRobustANGLE:
return "glGetInteger64vRobustANGLE";
case EntryPoint::GetIntegeri_v:

Просмотреть файл

@ -444,6 +444,7 @@ enum class EntryPoint
GetInteger64i_v,
GetInteger64i_vRobustANGLE,
GetInteger64v,
GetInteger64vEXT,
GetInteger64vRobustANGLE,
GetIntegeri_v,
GetIntegeri_vRobustANGLE,

Просмотреть файл

@ -2341,6 +2341,7 @@ void DispatchTableGL::initProcsGLES(const gl::Version &version,
ASSIGN("glDeleteQueriesEXT", deleteQueries);
ASSIGN("glEndQueryEXT", endQuery);
ASSIGN("glGenQueriesEXT", genQueries);
ASSIGN("glGetInteger64vEXT", getInteger64v);
ASSIGN("glGetQueryObjecti64vEXT", getQueryObjecti64v);
ASSIGN("glGetQueryObjectivEXT", getQueryObjectiv);
ASSIGN("glGetQueryObjectui64vEXT", getQueryObjectui64v);
@ -5132,6 +5133,7 @@ void DispatchTableGL::initProcsGLESNULL(const gl::Version &version,
deleteQueries = &glDeleteQueriesNULL;
endQuery = &glEndQueryNULL;
genQueries = &glGenQueriesNULL;
getInteger64v = &glGetInteger64vNULL;
getQueryObjecti64v = &glGetQueryObjecti64vNULL;
getQueryObjectiv = &glGetQueryObjectivNULL;
getQueryObjectui64v = &glGetQueryObjectui64vNULL;

Просмотреть файл

@ -497,4 +497,22 @@ bool ValidateIsEnablediOES(const Context *context, GLenum target, GLuint index)
return ValidateIsEnabledi(context, target, index);
}
bool ValidateGetInteger64vEXT(const Context *context, GLenum pname, const GLint64 *data)
{
if (!context->getExtensions().disjointTimerQuery)
{
context->validationError(GL_INVALID_OPERATION, kExtensionNotEnabled);
return false;
}
GLenum nativeType = GL_NONE;
unsigned int numParams = 0;
if (!ValidateStateQuery(context, pname, &nativeType, &numParams))
{
return false;
}
return true;
}
} // namespace gl

Просмотреть файл

@ -850,6 +850,7 @@ bool ValidateBeginQueryEXT(const Context *context, QueryType targetPacked, Query
bool ValidateDeleteQueriesEXT(const Context *context, GLsizei n, const QueryID *idsPacked);
bool ValidateEndQueryEXT(const Context *context, QueryType targetPacked);
bool ValidateGenQueriesEXT(const Context *context, GLsizei n, const QueryID *idsPacked);
bool ValidateGetInteger64vEXT(const Context *context, GLenum pname, const GLint64 *data);
bool ValidateGetQueryObjecti64vEXT(const Context *context,
QueryID idPacked,
GLenum pname,

Просмотреть файл

@ -4035,6 +4035,26 @@ void GL_APIENTRY GenQueriesEXT(GLsizei n, GLuint *ids)
}
}
void GL_APIENTRY GetInteger64vEXT(GLenum pname, GLint64 *data)
{
Context *context = GetValidGlobalContext();
EVENT("glGetInteger64vEXT",
"context = %d, GLenum pname = %s, GLint64 *data = 0x%016" PRIxPTR "", CID(context),
GLenumToString(GLenumGroup::GetPName, pname), (uintptr_t)data);
if (context)
{
std::unique_lock<angle::GlobalMutex> shareContextLock = GetShareGroupLock(context);
bool isCallValid =
(context->skipValidation() || ValidateGetInteger64vEXT(context, pname, data));
if (isCallValid)
{
context->getInteger64v(pname, data);
}
ANGLE_CAPTURE(GetInteger64vEXT, isCallValid, context, pname, data);
}
}
void GL_APIENTRY GetQueryObjecti64vEXT(GLuint id, GLenum pname, GLint64 *params)
{
Context *context = GetGlobalContext();
@ -14187,6 +14207,27 @@ void GL_APIENTRY GetInteger64vContextANGLE(GLeglContext ctx, GLenum pname, GLint
}
}
void GL_APIENTRY GetInteger64vEXTContextANGLE(GLeglContext ctx, GLenum pname, GLint64 *data)
{
Context *context = static_cast<gl::Context *>(ctx);
EVENT("glGetInteger64vEXT",
"context = %d, GLenum pname = %s, GLint64 *data = 0x%016" PRIxPTR "", CID(context),
GLenumToString(GLenumGroup::GetPName, pname), (uintptr_t)data);
if (context)
{
ASSERT(context == GetValidGlobalContext());
std::unique_lock<angle::GlobalMutex> shareContextLock = GetShareGroupLock(context);
bool isCallValid =
(context->skipValidation() || ValidateGetInteger64vEXT(context, pname, data));
if (isCallValid)
{
context->getInteger64v(pname, data);
}
ANGLE_CAPTURE(GetInteger64vEXT, isCallValid, context, pname, data);
}
}
void GL_APIENTRY GetIntegeri_vContextANGLE(GLeglContext ctx,
GLenum target,
GLuint index,

Просмотреть файл

@ -721,6 +721,7 @@ ANGLE_EXPORT void GL_APIENTRY BeginQueryEXT(GLenum target, GLuint id);
ANGLE_EXPORT void GL_APIENTRY DeleteQueriesEXT(GLsizei n, const GLuint *ids);
ANGLE_EXPORT void GL_APIENTRY EndQueryEXT(GLenum target);
ANGLE_EXPORT void GL_APIENTRY GenQueriesEXT(GLsizei n, GLuint *ids);
ANGLE_EXPORT void GL_APIENTRY GetInteger64vEXT(GLenum pname, GLint64 *data);
ANGLE_EXPORT void GL_APIENTRY GetQueryObjecti64vEXT(GLuint id, GLenum pname, GLint64 *params);
ANGLE_EXPORT void GL_APIENTRY GetQueryObjectivEXT(GLuint id, GLenum pname, GLint *params);
ANGLE_EXPORT void GL_APIENTRY GetQueryObjectui64vEXT(GLuint id, GLenum pname, GLuint64 *params);
@ -2170,6 +2171,9 @@ ANGLE_EXPORT void GL_APIENTRY GetInteger64i_vContextANGLE(GLeglContext ctx,
ANGLE_EXPORT void GL_APIENTRY GetInteger64vContextANGLE(GLeglContext ctx,
GLenum pname,
GLint64 *data);
ANGLE_EXPORT void GL_APIENTRY GetInteger64vEXTContextANGLE(GLeglContext ctx,
GLenum pname,
GLint64 *data);
ANGLE_EXPORT void GL_APIENTRY GetIntegeri_vContextANGLE(GLeglContext ctx,
GLenum target,
GLuint index,

Просмотреть файл

@ -3971,6 +3971,11 @@ void GL_APIENTRY glGenQueriesEXT(GLsizei n, GLuint *ids)
return gl::GenQueriesEXT(n, ids);
}
void GL_APIENTRY glGetInteger64vEXT(GLenum pname, GLint64 *data)
{
return gl::GetInteger64vEXT(pname, data);
}
void GL_APIENTRY glGetQueryObjecti64vEXT(GLuint id, GLenum pname, GLint64 *params)
{
return gl::GetQueryObjecti64vEXT(id, pname, params);
@ -6878,6 +6883,11 @@ void GL_APIENTRY glGetInteger64vContextANGLE(GLeglContext ctx, GLenum pname, GLi
return gl::GetInteger64vContextANGLE(ctx, pname, data);
}
void GL_APIENTRY glGetInteger64vEXTContextANGLE(GLeglContext ctx, GLenum pname, GLint64 *data)
{
return gl::GetInteger64vEXTContextANGLE(ctx, pname, data);
}
void GL_APIENTRY glGetIntegeri_vContextANGLE(GLeglContext ctx,
GLenum target,
GLuint index,

Просмотреть файл

@ -648,6 +648,7 @@ EXPORTS
glDeleteQueriesEXT
glEndQueryEXT
glGenQueriesEXT
glGetInteger64vEXT
glGetQueryObjecti64vEXT
glGetQueryObjectivEXT
glGetQueryObjectui64vEXT
@ -1167,6 +1168,7 @@ EXPORTS
glGetInteger64i_vContextANGLE
glGetInteger64i_vRobustANGLEContextANGLE
glGetInteger64vContextANGLE
glGetInteger64vEXTContextANGLE
glGetInteger64vRobustANGLEContextANGLE
glGetIntegeri_vContextANGLE
glGetIntegeri_vRobustANGLEContextANGLE

Просмотреть файл

@ -648,6 +648,7 @@ EXPORTS
glDeleteQueriesEXT
glEndQueryEXT
glGenQueriesEXT
glGetInteger64vEXT
glGetQueryObjecti64vEXT
glGetQueryObjectivEXT
glGetQueryObjectui64vEXT
@ -1167,6 +1168,7 @@ EXPORTS
glGetInteger64i_vContextANGLE
glGetInteger64i_vRobustANGLEContextANGLE
glGetInteger64vContextANGLE
glGetInteger64vEXTContextANGLE
glGetInteger64vRobustANGLEContextANGLE
glGetIntegeri_vContextANGLE
glGetIntegeri_vRobustANGLEContextANGLE

Просмотреть файл

@ -648,6 +648,7 @@ EXPORTS
glDeleteQueriesEXT
glEndQueryEXT
glGenQueriesEXT
glGetInteger64vEXT
glGetQueryObjecti64vEXT
glGetQueryObjectivEXT
glGetQueryObjectui64vEXT
@ -1167,6 +1168,7 @@ EXPORTS
glGetInteger64i_vContextANGLE
glGetInteger64i_vRobustANGLEContextANGLE
glGetInteger64vContextANGLE
glGetInteger64vEXTContextANGLE
glGetInteger64vRobustANGLEContextANGLE
glGetIntegeri_vContextANGLE
glGetIntegeri_vRobustANGLEContextANGLE

Просмотреть файл

@ -663,6 +663,8 @@ ProcEntry g_procTable[] = {
{"glGetInteger64i_vRobustANGLEContextANGLE", P(gl::GetInteger64i_vRobustANGLEContextANGLE)},
{"glGetInteger64v", P(gl::GetInteger64v)},
{"glGetInteger64vContextANGLE", P(gl::GetInteger64vContextANGLE)},
{"glGetInteger64vEXT", P(gl::GetInteger64vEXT)},
{"glGetInteger64vEXTContextANGLE", P(gl::GetInteger64vEXTContextANGLE)},
{"glGetInteger64vRobustANGLE", P(gl::GetInteger64vRobustANGLE)},
{"glGetInteger64vRobustANGLEContextANGLE", P(gl::GetInteger64vRobustANGLEContextANGLE)},
{"glGetIntegeri_v", P(gl::GetIntegeri_v)},
@ -1578,5 +1580,5 @@ ProcEntry g_procTable[] = {
{"glWeightPointerOES", P(gl::WeightPointerOES)},
{"glWeightPointerOESContextANGLE", P(gl::WeightPointerOESContextANGLE)}};
size_t g_numProcs = 1472;
size_t g_numProcs = 1474;
} // namespace egl

Просмотреть файл

@ -559,6 +559,7 @@ ANGLE_UTIL_EXPORT PFNGLBEGINQUERYEXTPROC glBeginQueryEXT;
ANGLE_UTIL_EXPORT PFNGLDELETEQUERIESEXTPROC glDeleteQueriesEXT;
ANGLE_UTIL_EXPORT PFNGLENDQUERYEXTPROC glEndQueryEXT;
ANGLE_UTIL_EXPORT PFNGLGENQUERIESEXTPROC glGenQueriesEXT;
ANGLE_UTIL_EXPORT PFNGLGETINTEGER64VEXTPROC glGetInteger64vEXT;
ANGLE_UTIL_EXPORT PFNGLGETQUERYOBJECTI64VEXTPROC glGetQueryObjecti64vEXT;
ANGLE_UTIL_EXPORT PFNGLGETQUERYOBJECTIVEXTPROC glGetQueryObjectivEXT;
ANGLE_UTIL_EXPORT PFNGLGETQUERYOBJECTUI64VEXTPROC glGetQueryObjectui64vEXT;
@ -1379,6 +1380,7 @@ ANGLE_UTIL_EXPORT PFNGLBEGINQUERYEXTCONTEXTANGLEPROC glBeginQueryEXTContextANGLE
ANGLE_UTIL_EXPORT PFNGLDELETEQUERIESEXTCONTEXTANGLEPROC glDeleteQueriesEXTContextANGLE;
ANGLE_UTIL_EXPORT PFNGLENDQUERYEXTCONTEXTANGLEPROC glEndQueryEXTContextANGLE;
ANGLE_UTIL_EXPORT PFNGLGENQUERIESEXTCONTEXTANGLEPROC glGenQueriesEXTContextANGLE;
ANGLE_UTIL_EXPORT PFNGLGETINTEGER64VEXTCONTEXTANGLEPROC glGetInteger64vEXTContextANGLE;
ANGLE_UTIL_EXPORT PFNGLGETQUERYOBJECTI64VEXTCONTEXTANGLEPROC glGetQueryObjecti64vEXTContextANGLE;
ANGLE_UTIL_EXPORT PFNGLGETQUERYOBJECTIVEXTCONTEXTANGLEPROC glGetQueryObjectivEXTContextANGLE;
ANGLE_UTIL_EXPORT PFNGLGETQUERYOBJECTUI64VEXTCONTEXTANGLEPROC glGetQueryObjectui64vEXTContextANGLE;
@ -2441,6 +2443,8 @@ void LoadGLES(LoadProc loadProc)
reinterpret_cast<PFNGLDELETEQUERIESEXTPROC>(loadProc("glDeleteQueriesEXT"));
glEndQueryEXT = reinterpret_cast<PFNGLENDQUERYEXTPROC>(loadProc("glEndQueryEXT"));
glGenQueriesEXT = reinterpret_cast<PFNGLGENQUERIESEXTPROC>(loadProc("glGenQueriesEXT"));
glGetInteger64vEXT =
reinterpret_cast<PFNGLGETINTEGER64VEXTPROC>(loadProc("glGetInteger64vEXT"));
glGetQueryObjecti64vEXT =
reinterpret_cast<PFNGLGETQUERYOBJECTI64VEXTPROC>(loadProc("glGetQueryObjecti64vEXT"));
glGetQueryObjectivEXT =
@ -3962,6 +3966,8 @@ void LoadGLES(LoadProc loadProc)
reinterpret_cast<PFNGLENDQUERYEXTCONTEXTANGLEPROC>(loadProc("glEndQueryEXTContextANGLE"));
glGenQueriesEXTContextANGLE = reinterpret_cast<PFNGLGENQUERIESEXTCONTEXTANGLEPROC>(
loadProc("glGenQueriesEXTContextANGLE"));
glGetInteger64vEXTContextANGLE = reinterpret_cast<PFNGLGETINTEGER64VEXTCONTEXTANGLEPROC>(
loadProc("glGetInteger64vEXTContextANGLE"));
glGetQueryObjecti64vEXTContextANGLE =
reinterpret_cast<PFNGLGETQUERYOBJECTI64VEXTCONTEXTANGLEPROC>(
loadProc("glGetQueryObjecti64vEXTContextANGLE"));

Просмотреть файл

@ -588,6 +588,7 @@ ANGLE_UTIL_EXPORT extern PFNGLBEGINQUERYEXTPROC glBeginQueryEXT;
ANGLE_UTIL_EXPORT extern PFNGLDELETEQUERIESEXTPROC glDeleteQueriesEXT;
ANGLE_UTIL_EXPORT extern PFNGLENDQUERYEXTPROC glEndQueryEXT;
ANGLE_UTIL_EXPORT extern PFNGLGENQUERIESEXTPROC glGenQueriesEXT;
ANGLE_UTIL_EXPORT extern PFNGLGETINTEGER64VEXTPROC glGetInteger64vEXT;
ANGLE_UTIL_EXPORT extern PFNGLGETQUERYOBJECTI64VEXTPROC glGetQueryObjecti64vEXT;
ANGLE_UTIL_EXPORT extern PFNGLGETQUERYOBJECTIVEXTPROC glGetQueryObjectivEXT;
ANGLE_UTIL_EXPORT extern PFNGLGETQUERYOBJECTUI64VEXTPROC glGetQueryObjectui64vEXT;
@ -1470,6 +1471,7 @@ ANGLE_UTIL_EXPORT extern PFNGLBEGINQUERYEXTCONTEXTANGLEPROC glBeginQueryEXTConte
ANGLE_UTIL_EXPORT extern PFNGLDELETEQUERIESEXTCONTEXTANGLEPROC glDeleteQueriesEXTContextANGLE;
ANGLE_UTIL_EXPORT extern PFNGLENDQUERYEXTCONTEXTANGLEPROC glEndQueryEXTContextANGLE;
ANGLE_UTIL_EXPORT extern PFNGLGENQUERIESEXTCONTEXTANGLEPROC glGenQueriesEXTContextANGLE;
ANGLE_UTIL_EXPORT extern PFNGLGETINTEGER64VEXTCONTEXTANGLEPROC glGetInteger64vEXTContextANGLE;
ANGLE_UTIL_EXPORT extern PFNGLGETQUERYOBJECTI64VEXTCONTEXTANGLEPROC
glGetQueryObjecti64vEXTContextANGLE;
ANGLE_UTIL_EXPORT extern PFNGLGETQUERYOBJECTIVEXTCONTEXTANGLEPROC glGetQueryObjectivEXTContextANGLE;