зеркало из https://github.com/AvaloniaUI/angle.git
Capture/Replay: Don't handle void pointers as const
TL;DR: glReadPixels needs a non-const pointer if a pack buffer is bound, so change the code generation to keep TvoidPointer non-const and regenerate the entry points. Long version: When no pack buffer is bound, then in WriteCppReplayForCall param.readBufferSizeBytes is non-zero and the cast of the read buffer pointer is using the type passed by the parameter (TvoidPionter) to write the typecast by calling ParamTypeToString directly, which returns "void *". If. OTOH, a pack buffer is bound, then param.readBufferSizeBytes is zero, and the default WriteParamCaptureReplay is called. This autogenerated function forwards the call to WriteParamValueReplay by using an explicit type specification, and the autogeneration code was translating TvoidPointer to call WriteParamValueReplay<ParamType::TvoidConstPointer> which would then translate to "const void *" in the parameter type cast, and this would lead to a compilation failure, because the parameter must be a non-const pointer. Change the autogeneration code so that TvoidPointer is not forced to be a const pointer and regenerate the entry points. Bug: angleproject:6521 Change-Id: I673c77f803a284fb7dfc08a2e0918aebdf698194 Reviewed-on: https://chromium-review.googlesource.com/c/angle/angle/+/3204959 Reviewed-by: Jamie Madill <jmadill@chromium.org> Reviewed-by: Cody Northrop <cnorthrop@google.com> Commit-Queue: Gert Wollny <gert.wollny@collabora.com>
This commit is contained in:
Родитель
f13731ae0e
Коммит
8712495dab
scripts
src/libANGLE/capture
|
@ -10,7 +10,7 @@
|
|||
"scripts/entry_point_packed_gl_enums.json":
|
||||
"e651b622b5ab1241ab7bc273d0114e19",
|
||||
"scripts/generate_entry_points.py":
|
||||
"b215414751c7c1b976482edc1a7ffc77",
|
||||
"f9a113db7222b9517555a8781da42c18",
|
||||
"scripts/gl.xml":
|
||||
"a442a7aeff3a2f0a1fba52ee08089500",
|
||||
"scripts/gl_angle_ext.xml":
|
||||
|
@ -70,7 +70,7 @@
|
|||
"src/libANGLE/capture/frame_capture_replay_autogen.cpp":
|
||||
"35a7d96b9718ce40285eea0f6355caa3",
|
||||
"src/libANGLE/capture/frame_capture_utils_autogen.cpp":
|
||||
"57a6782fdb6966a1ff08efa39b1f99df",
|
||||
"1f6acde257210668956a1b277567440b",
|
||||
"src/libANGLE/capture/frame_capture_utils_autogen.h":
|
||||
"b4950440946481455bd7862af34171a4",
|
||||
"src/libANGLE/validationCL_autogen.h":
|
||||
|
|
|
@ -2175,10 +2175,8 @@ def format_init_param_value_case(param_type):
|
|||
|
||||
|
||||
def format_write_param_type_to_stream_case(param_type):
|
||||
# Force all enum printing to go through "const void *"
|
||||
param_out = "voidConstPointer" if "Pointer" in param_type else param_type
|
||||
return TEMPLATE_WRITE_PARAM_TYPE_TO_STREAM_CASE.format(
|
||||
enum_in=param_type, enum_out=param_out, union_name=get_param_type_union_name(param_out))
|
||||
enum_in=param_type, enum_out=param_type, union_name=get_param_type_union_name(param_type))
|
||||
|
||||
|
||||
def get_resource_id_types(all_param_types):
|
||||
|
|
|
@ -19,8 +19,8 @@ void WriteParamCaptureReplay(std::ostream &os, const CallCapture &call, const Pa
|
|||
switch (param.type)
|
||||
{
|
||||
case ParamType::TAHardwareBufferConstPointer:
|
||||
WriteParamValueReplay<ParamType::TvoidConstPointer>(os, call,
|
||||
param.value.voidConstPointerVal);
|
||||
WriteParamValueReplay<ParamType::TAHardwareBufferConstPointer>(
|
||||
os, call, param.value.AHardwareBufferConstPointerVal);
|
||||
break;
|
||||
case ParamType::TAlphaTestFunc:
|
||||
WriteParamValueReplay<ParamType::TAlphaTestFunc>(os, call,
|
||||
|
@ -34,12 +34,12 @@ void WriteParamCaptureReplay(std::ostream &os, const CallCapture &call, const Pa
|
|||
WriteParamValueReplay<ParamType::TBufferID>(os, call, param.value.BufferIDVal);
|
||||
break;
|
||||
case ParamType::TBufferIDConstPointer:
|
||||
WriteParamValueReplay<ParamType::TvoidConstPointer>(os, call,
|
||||
param.value.voidConstPointerVal);
|
||||
WriteParamValueReplay<ParamType::TBufferIDConstPointer>(
|
||||
os, call, param.value.BufferIDConstPointerVal);
|
||||
break;
|
||||
case ParamType::TBufferIDPointer:
|
||||
WriteParamValueReplay<ParamType::TvoidConstPointer>(os, call,
|
||||
param.value.voidConstPointerVal);
|
||||
WriteParamValueReplay<ParamType::TBufferIDPointer>(os, call,
|
||||
param.value.BufferIDPointerVal);
|
||||
break;
|
||||
case ParamType::TBufferUsage:
|
||||
WriteParamValueReplay<ParamType::TBufferUsage>(os, call, param.value.BufferUsageVal);
|
||||
|
@ -147,24 +147,24 @@ void WriteParamCaptureReplay(std::ostream &os, const CallCapture &call, const Pa
|
|||
WriteParamValueReplay<ParamType::TFenceNVID>(os, call, param.value.FenceNVIDVal);
|
||||
break;
|
||||
case ParamType::TFenceNVIDConstPointer:
|
||||
WriteParamValueReplay<ParamType::TvoidConstPointer>(os, call,
|
||||
param.value.voidConstPointerVal);
|
||||
WriteParamValueReplay<ParamType::TFenceNVIDConstPointer>(
|
||||
os, call, param.value.FenceNVIDConstPointerVal);
|
||||
break;
|
||||
case ParamType::TFenceNVIDPointer:
|
||||
WriteParamValueReplay<ParamType::TvoidConstPointer>(os, call,
|
||||
param.value.voidConstPointerVal);
|
||||
WriteParamValueReplay<ParamType::TFenceNVIDPointer>(os, call,
|
||||
param.value.FenceNVIDPointerVal);
|
||||
break;
|
||||
case ParamType::TFramebufferID:
|
||||
WriteParamValueReplay<ParamType::TFramebufferID>(os, call,
|
||||
param.value.FramebufferIDVal);
|
||||
break;
|
||||
case ParamType::TFramebufferIDConstPointer:
|
||||
WriteParamValueReplay<ParamType::TvoidConstPointer>(os, call,
|
||||
param.value.voidConstPointerVal);
|
||||
WriteParamValueReplay<ParamType::TFramebufferIDConstPointer>(
|
||||
os, call, param.value.FramebufferIDConstPointerVal);
|
||||
break;
|
||||
case ParamType::TFramebufferIDPointer:
|
||||
WriteParamValueReplay<ParamType::TvoidConstPointer>(os, call,
|
||||
param.value.voidConstPointerVal);
|
||||
WriteParamValueReplay<ParamType::TFramebufferIDPointer>(
|
||||
os, call, param.value.FramebufferIDPointerVal);
|
||||
break;
|
||||
case ParamType::TGLDEBUGPROC:
|
||||
WriteParamValueReplay<ParamType::TGLDEBUGPROC>(os, call, param.value.GLDEBUGPROCVal);
|
||||
|
@ -180,31 +180,31 @@ void WriteParamCaptureReplay(std::ostream &os, const CallCapture &call, const Pa
|
|||
WriteParamValueReplay<ParamType::TGLboolean>(os, call, param.value.GLbooleanVal);
|
||||
break;
|
||||
case ParamType::TGLbooleanConstPointer:
|
||||
WriteParamValueReplay<ParamType::TvoidConstPointer>(os, call,
|
||||
param.value.voidConstPointerVal);
|
||||
WriteParamValueReplay<ParamType::TGLbooleanConstPointer>(
|
||||
os, call, param.value.GLbooleanConstPointerVal);
|
||||
break;
|
||||
case ParamType::TGLbooleanPointer:
|
||||
WriteParamValueReplay<ParamType::TvoidConstPointer>(os, call,
|
||||
param.value.voidConstPointerVal);
|
||||
WriteParamValueReplay<ParamType::TGLbooleanPointer>(os, call,
|
||||
param.value.GLbooleanPointerVal);
|
||||
break;
|
||||
case ParamType::TGLbyte:
|
||||
WriteParamValueReplay<ParamType::TGLbyte>(os, call, param.value.GLbyteVal);
|
||||
break;
|
||||
case ParamType::TGLbyteConstPointer:
|
||||
WriteParamValueReplay<ParamType::TvoidConstPointer>(os, call,
|
||||
param.value.voidConstPointerVal);
|
||||
WriteParamValueReplay<ParamType::TGLbyteConstPointer>(
|
||||
os, call, param.value.GLbyteConstPointerVal);
|
||||
break;
|
||||
case ParamType::TGLcharConstPointer:
|
||||
WriteParamValueReplay<ParamType::TvoidConstPointer>(os, call,
|
||||
param.value.voidConstPointerVal);
|
||||
WriteParamValueReplay<ParamType::TGLcharConstPointer>(
|
||||
os, call, param.value.GLcharConstPointerVal);
|
||||
break;
|
||||
case ParamType::TGLcharConstPointerPointer:
|
||||
WriteParamValueReplay<ParamType::TvoidConstPointer>(os, call,
|
||||
param.value.voidConstPointerVal);
|
||||
WriteParamValueReplay<ParamType::TGLcharConstPointerPointer>(
|
||||
os, call, param.value.GLcharConstPointerPointerVal);
|
||||
break;
|
||||
case ParamType::TGLcharPointer:
|
||||
WriteParamValueReplay<ParamType::TvoidConstPointer>(os, call,
|
||||
param.value.voidConstPointerVal);
|
||||
WriteParamValueReplay<ParamType::TGLcharPointer>(os, call,
|
||||
param.value.GLcharPointerVal);
|
||||
break;
|
||||
case ParamType::TGLclampx:
|
||||
WriteParamValueReplay<ParamType::TGLclampx>(os, call, param.value.GLclampxVal);
|
||||
|
@ -213,12 +213,12 @@ void WriteParamCaptureReplay(std::ostream &os, const CallCapture &call, const Pa
|
|||
WriteParamValueReplay<ParamType::TGLdouble>(os, call, param.value.GLdoubleVal);
|
||||
break;
|
||||
case ParamType::TGLdoubleConstPointer:
|
||||
WriteParamValueReplay<ParamType::TvoidConstPointer>(os, call,
|
||||
param.value.voidConstPointerVal);
|
||||
WriteParamValueReplay<ParamType::TGLdoubleConstPointer>(
|
||||
os, call, param.value.GLdoubleConstPointerVal);
|
||||
break;
|
||||
case ParamType::TGLdoublePointer:
|
||||
WriteParamValueReplay<ParamType::TvoidConstPointer>(os, call,
|
||||
param.value.voidConstPointerVal);
|
||||
WriteParamValueReplay<ParamType::TGLdoublePointer>(os, call,
|
||||
param.value.GLdoublePointerVal);
|
||||
break;
|
||||
case ParamType::TGLeglClientBufferEXT:
|
||||
WriteParamValueReplay<ParamType::TGLeglClientBufferEXT>(
|
||||
|
@ -232,81 +232,80 @@ void WriteParamCaptureReplay(std::ostream &os, const CallCapture &call, const Pa
|
|||
WriteParamValueReplay<ParamType::TGLenum>(os, call, param.value.GLenumVal);
|
||||
break;
|
||||
case ParamType::TGLenumConstPointer:
|
||||
WriteParamValueReplay<ParamType::TvoidConstPointer>(os, call,
|
||||
param.value.voidConstPointerVal);
|
||||
WriteParamValueReplay<ParamType::TGLenumConstPointer>(
|
||||
os, call, param.value.GLenumConstPointerVal);
|
||||
break;
|
||||
case ParamType::TGLenumPointer:
|
||||
WriteParamValueReplay<ParamType::TvoidConstPointer>(os, call,
|
||||
param.value.voidConstPointerVal);
|
||||
WriteParamValueReplay<ParamType::TGLenumPointer>(os, call,
|
||||
param.value.GLenumPointerVal);
|
||||
break;
|
||||
case ParamType::TGLfixed:
|
||||
WriteParamValueReplay<ParamType::TGLfixed>(os, call, param.value.GLfixedVal);
|
||||
break;
|
||||
case ParamType::TGLfixedConstPointer:
|
||||
WriteParamValueReplay<ParamType::TvoidConstPointer>(os, call,
|
||||
param.value.voidConstPointerVal);
|
||||
WriteParamValueReplay<ParamType::TGLfixedConstPointer>(
|
||||
os, call, param.value.GLfixedConstPointerVal);
|
||||
break;
|
||||
case ParamType::TGLfixedPointer:
|
||||
WriteParamValueReplay<ParamType::TvoidConstPointer>(os, call,
|
||||
param.value.voidConstPointerVal);
|
||||
WriteParamValueReplay<ParamType::TGLfixedPointer>(os, call,
|
||||
param.value.GLfixedPointerVal);
|
||||
break;
|
||||
case ParamType::TGLfloat:
|
||||
WriteParamValueReplay<ParamType::TGLfloat>(os, call, param.value.GLfloatVal);
|
||||
break;
|
||||
case ParamType::TGLfloatConstPointer:
|
||||
WriteParamValueReplay<ParamType::TvoidConstPointer>(os, call,
|
||||
param.value.voidConstPointerVal);
|
||||
WriteParamValueReplay<ParamType::TGLfloatConstPointer>(
|
||||
os, call, param.value.GLfloatConstPointerVal);
|
||||
break;
|
||||
case ParamType::TGLfloatPointer:
|
||||
WriteParamValueReplay<ParamType::TvoidConstPointer>(os, call,
|
||||
param.value.voidConstPointerVal);
|
||||
WriteParamValueReplay<ParamType::TGLfloatPointer>(os, call,
|
||||
param.value.GLfloatPointerVal);
|
||||
break;
|
||||
case ParamType::TGLint:
|
||||
WriteParamValueReplay<ParamType::TGLint>(os, call, param.value.GLintVal);
|
||||
break;
|
||||
case ParamType::TGLint64Pointer:
|
||||
WriteParamValueReplay<ParamType::TvoidConstPointer>(os, call,
|
||||
param.value.voidConstPointerVal);
|
||||
WriteParamValueReplay<ParamType::TGLint64Pointer>(os, call,
|
||||
param.value.GLint64PointerVal);
|
||||
break;
|
||||
case ParamType::TGLintConstPointer:
|
||||
WriteParamValueReplay<ParamType::TvoidConstPointer>(os, call,
|
||||
param.value.voidConstPointerVal);
|
||||
WriteParamValueReplay<ParamType::TGLintConstPointer>(os, call,
|
||||
param.value.GLintConstPointerVal);
|
||||
break;
|
||||
case ParamType::TGLintPointer:
|
||||
WriteParamValueReplay<ParamType::TvoidConstPointer>(os, call,
|
||||
param.value.voidConstPointerVal);
|
||||
WriteParamValueReplay<ParamType::TGLintPointer>(os, call, param.value.GLintPointerVal);
|
||||
break;
|
||||
case ParamType::TGLintptr:
|
||||
WriteParamValueReplay<ParamType::TGLintptr>(os, call, param.value.GLintptrVal);
|
||||
break;
|
||||
case ParamType::TGLintptrConstPointer:
|
||||
WriteParamValueReplay<ParamType::TvoidConstPointer>(os, call,
|
||||
param.value.voidConstPointerVal);
|
||||
WriteParamValueReplay<ParamType::TGLintptrConstPointer>(
|
||||
os, call, param.value.GLintptrConstPointerVal);
|
||||
break;
|
||||
case ParamType::TGLshort:
|
||||
WriteParamValueReplay<ParamType::TGLshort>(os, call, param.value.GLshortVal);
|
||||
break;
|
||||
case ParamType::TGLshortConstPointer:
|
||||
WriteParamValueReplay<ParamType::TvoidConstPointer>(os, call,
|
||||
param.value.voidConstPointerVal);
|
||||
WriteParamValueReplay<ParamType::TGLshortConstPointer>(
|
||||
os, call, param.value.GLshortConstPointerVal);
|
||||
break;
|
||||
case ParamType::TGLsizei:
|
||||
WriteParamValueReplay<ParamType::TGLsizei>(os, call, param.value.GLsizeiVal);
|
||||
break;
|
||||
case ParamType::TGLsizeiConstPointer:
|
||||
WriteParamValueReplay<ParamType::TvoidConstPointer>(os, call,
|
||||
param.value.voidConstPointerVal);
|
||||
WriteParamValueReplay<ParamType::TGLsizeiConstPointer>(
|
||||
os, call, param.value.GLsizeiConstPointerVal);
|
||||
break;
|
||||
case ParamType::TGLsizeiPointer:
|
||||
WriteParamValueReplay<ParamType::TvoidConstPointer>(os, call,
|
||||
param.value.voidConstPointerVal);
|
||||
WriteParamValueReplay<ParamType::TGLsizeiPointer>(os, call,
|
||||
param.value.GLsizeiPointerVal);
|
||||
break;
|
||||
case ParamType::TGLsizeiptr:
|
||||
WriteParamValueReplay<ParamType::TGLsizeiptr>(os, call, param.value.GLsizeiptrVal);
|
||||
break;
|
||||
case ParamType::TGLsizeiptrConstPointer:
|
||||
WriteParamValueReplay<ParamType::TvoidConstPointer>(os, call,
|
||||
param.value.voidConstPointerVal);
|
||||
WriteParamValueReplay<ParamType::TGLsizeiptrConstPointer>(
|
||||
os, call, param.value.GLsizeiptrConstPointerVal);
|
||||
break;
|
||||
case ParamType::TGLsync:
|
||||
WriteParamValueReplay<ParamType::TGLsync>(os, call, param.value.GLsyncVal);
|
||||
|
@ -315,12 +314,12 @@ void WriteParamCaptureReplay(std::ostream &os, const CallCapture &call, const Pa
|
|||
WriteParamValueReplay<ParamType::TGLubyte>(os, call, param.value.GLubyteVal);
|
||||
break;
|
||||
case ParamType::TGLubyteConstPointer:
|
||||
WriteParamValueReplay<ParamType::TvoidConstPointer>(os, call,
|
||||
param.value.voidConstPointerVal);
|
||||
WriteParamValueReplay<ParamType::TGLubyteConstPointer>(
|
||||
os, call, param.value.GLubyteConstPointerVal);
|
||||
break;
|
||||
case ParamType::TGLubytePointer:
|
||||
WriteParamValueReplay<ParamType::TvoidConstPointer>(os, call,
|
||||
param.value.voidConstPointerVal);
|
||||
WriteParamValueReplay<ParamType::TGLubytePointer>(os, call,
|
||||
param.value.GLubytePointerVal);
|
||||
break;
|
||||
case ParamType::TGLuint:
|
||||
WriteParamValueReplay<ParamType::TGLuint>(os, call, param.value.GLuintVal);
|
||||
|
@ -329,39 +328,39 @@ void WriteParamCaptureReplay(std::ostream &os, const CallCapture &call, const Pa
|
|||
WriteParamValueReplay<ParamType::TGLuint64>(os, call, param.value.GLuint64Val);
|
||||
break;
|
||||
case ParamType::TGLuint64ConstPointer:
|
||||
WriteParamValueReplay<ParamType::TvoidConstPointer>(os, call,
|
||||
param.value.voidConstPointerVal);
|
||||
WriteParamValueReplay<ParamType::TGLuint64ConstPointer>(
|
||||
os, call, param.value.GLuint64ConstPointerVal);
|
||||
break;
|
||||
case ParamType::TGLuint64Pointer:
|
||||
WriteParamValueReplay<ParamType::TvoidConstPointer>(os, call,
|
||||
param.value.voidConstPointerVal);
|
||||
WriteParamValueReplay<ParamType::TGLuint64Pointer>(os, call,
|
||||
param.value.GLuint64PointerVal);
|
||||
break;
|
||||
case ParamType::TGLuintConstPointer:
|
||||
WriteParamValueReplay<ParamType::TvoidConstPointer>(os, call,
|
||||
param.value.voidConstPointerVal);
|
||||
WriteParamValueReplay<ParamType::TGLuintConstPointer>(
|
||||
os, call, param.value.GLuintConstPointerVal);
|
||||
break;
|
||||
case ParamType::TGLuintPointer:
|
||||
WriteParamValueReplay<ParamType::TvoidConstPointer>(os, call,
|
||||
param.value.voidConstPointerVal);
|
||||
WriteParamValueReplay<ParamType::TGLuintPointer>(os, call,
|
||||
param.value.GLuintPointerVal);
|
||||
break;
|
||||
case ParamType::TGLushort:
|
||||
WriteParamValueReplay<ParamType::TGLushort>(os, call, param.value.GLushortVal);
|
||||
break;
|
||||
case ParamType::TGLushortConstPointer:
|
||||
WriteParamValueReplay<ParamType::TvoidConstPointer>(os, call,
|
||||
param.value.voidConstPointerVal);
|
||||
WriteParamValueReplay<ParamType::TGLushortConstPointer>(
|
||||
os, call, param.value.GLushortConstPointerVal);
|
||||
break;
|
||||
case ParamType::TGLushortPointer:
|
||||
WriteParamValueReplay<ParamType::TvoidConstPointer>(os, call,
|
||||
param.value.voidConstPointerVal);
|
||||
WriteParamValueReplay<ParamType::TGLushortPointer>(os, call,
|
||||
param.value.GLushortPointerVal);
|
||||
break;
|
||||
case ParamType::TGLvoidConstPointer:
|
||||
WriteParamValueReplay<ParamType::TvoidConstPointer>(os, call,
|
||||
param.value.voidConstPointerVal);
|
||||
WriteParamValueReplay<ParamType::TGLvoidConstPointer>(
|
||||
os, call, param.value.GLvoidConstPointerVal);
|
||||
break;
|
||||
case ParamType::TGLvoidConstPointerPointer:
|
||||
WriteParamValueReplay<ParamType::TvoidConstPointer>(os, call,
|
||||
param.value.voidConstPointerVal);
|
||||
WriteParamValueReplay<ParamType::TGLvoidConstPointerPointer>(
|
||||
os, call, param.value.GLvoidConstPointerPointerVal);
|
||||
break;
|
||||
case ParamType::TGraphicsResetStatus:
|
||||
WriteParamValueReplay<ParamType::TGraphicsResetStatus>(
|
||||
|
@ -390,12 +389,12 @@ void WriteParamCaptureReplay(std::ostream &os, const CallCapture &call, const Pa
|
|||
param.value.MemoryObjectIDVal);
|
||||
break;
|
||||
case ParamType::TMemoryObjectIDConstPointer:
|
||||
WriteParamValueReplay<ParamType::TvoidConstPointer>(os, call,
|
||||
param.value.voidConstPointerVal);
|
||||
WriteParamValueReplay<ParamType::TMemoryObjectIDConstPointer>(
|
||||
os, call, param.value.MemoryObjectIDConstPointerVal);
|
||||
break;
|
||||
case ParamType::TMemoryObjectIDPointer:
|
||||
WriteParamValueReplay<ParamType::TvoidConstPointer>(os, call,
|
||||
param.value.voidConstPointerVal);
|
||||
WriteParamValueReplay<ParamType::TMemoryObjectIDPointer>(
|
||||
os, call, param.value.MemoryObjectIDPointerVal);
|
||||
break;
|
||||
case ParamType::TObjectType:
|
||||
WriteParamValueReplay<ParamType::TObjectType>(os, call, param.value.ObjectTypeVal);
|
||||
|
@ -413,12 +412,12 @@ void WriteParamCaptureReplay(std::ostream &os, const CallCapture &call, const Pa
|
|||
param.value.ProgramPipelineIDVal);
|
||||
break;
|
||||
case ParamType::TProgramPipelineIDConstPointer:
|
||||
WriteParamValueReplay<ParamType::TvoidConstPointer>(os, call,
|
||||
param.value.voidConstPointerVal);
|
||||
WriteParamValueReplay<ParamType::TProgramPipelineIDConstPointer>(
|
||||
os, call, param.value.ProgramPipelineIDConstPointerVal);
|
||||
break;
|
||||
case ParamType::TProgramPipelineIDPointer:
|
||||
WriteParamValueReplay<ParamType::TvoidConstPointer>(os, call,
|
||||
param.value.voidConstPointerVal);
|
||||
WriteParamValueReplay<ParamType::TProgramPipelineIDPointer>(
|
||||
os, call, param.value.ProgramPipelineIDPointerVal);
|
||||
break;
|
||||
case ParamType::TProvokingVertexConvention:
|
||||
WriteParamValueReplay<ParamType::TProvokingVertexConvention>(
|
||||
|
@ -428,12 +427,12 @@ void WriteParamCaptureReplay(std::ostream &os, const CallCapture &call, const Pa
|
|||
WriteParamValueReplay<ParamType::TQueryID>(os, call, param.value.QueryIDVal);
|
||||
break;
|
||||
case ParamType::TQueryIDConstPointer:
|
||||
WriteParamValueReplay<ParamType::TvoidConstPointer>(os, call,
|
||||
param.value.voidConstPointerVal);
|
||||
WriteParamValueReplay<ParamType::TQueryIDConstPointer>(
|
||||
os, call, param.value.QueryIDConstPointerVal);
|
||||
break;
|
||||
case ParamType::TQueryIDPointer:
|
||||
WriteParamValueReplay<ParamType::TvoidConstPointer>(os, call,
|
||||
param.value.voidConstPointerVal);
|
||||
WriteParamValueReplay<ParamType::TQueryIDPointer>(os, call,
|
||||
param.value.QueryIDPointerVal);
|
||||
break;
|
||||
case ParamType::TQueryType:
|
||||
WriteParamValueReplay<ParamType::TQueryType>(os, call, param.value.QueryTypeVal);
|
||||
|
@ -443,46 +442,46 @@ void WriteParamCaptureReplay(std::ostream &os, const CallCapture &call, const Pa
|
|||
param.value.RenderbufferIDVal);
|
||||
break;
|
||||
case ParamType::TRenderbufferIDConstPointer:
|
||||
WriteParamValueReplay<ParamType::TvoidConstPointer>(os, call,
|
||||
param.value.voidConstPointerVal);
|
||||
WriteParamValueReplay<ParamType::TRenderbufferIDConstPointer>(
|
||||
os, call, param.value.RenderbufferIDConstPointerVal);
|
||||
break;
|
||||
case ParamType::TRenderbufferIDPointer:
|
||||
WriteParamValueReplay<ParamType::TvoidConstPointer>(os, call,
|
||||
param.value.voidConstPointerVal);
|
||||
WriteParamValueReplay<ParamType::TRenderbufferIDPointer>(
|
||||
os, call, param.value.RenderbufferIDPointerVal);
|
||||
break;
|
||||
case ParamType::TSamplerID:
|
||||
WriteParamValueReplay<ParamType::TSamplerID>(os, call, param.value.SamplerIDVal);
|
||||
break;
|
||||
case ParamType::TSamplerIDConstPointer:
|
||||
WriteParamValueReplay<ParamType::TvoidConstPointer>(os, call,
|
||||
param.value.voidConstPointerVal);
|
||||
WriteParamValueReplay<ParamType::TSamplerIDConstPointer>(
|
||||
os, call, param.value.SamplerIDConstPointerVal);
|
||||
break;
|
||||
case ParamType::TSamplerIDPointer:
|
||||
WriteParamValueReplay<ParamType::TvoidConstPointer>(os, call,
|
||||
param.value.voidConstPointerVal);
|
||||
WriteParamValueReplay<ParamType::TSamplerIDPointer>(os, call,
|
||||
param.value.SamplerIDPointerVal);
|
||||
break;
|
||||
case ParamType::TSemaphoreID:
|
||||
WriteParamValueReplay<ParamType::TSemaphoreID>(os, call, param.value.SemaphoreIDVal);
|
||||
break;
|
||||
case ParamType::TSemaphoreIDConstPointer:
|
||||
WriteParamValueReplay<ParamType::TvoidConstPointer>(os, call,
|
||||
param.value.voidConstPointerVal);
|
||||
WriteParamValueReplay<ParamType::TSemaphoreIDConstPointer>(
|
||||
os, call, param.value.SemaphoreIDConstPointerVal);
|
||||
break;
|
||||
case ParamType::TSemaphoreIDPointer:
|
||||
WriteParamValueReplay<ParamType::TvoidConstPointer>(os, call,
|
||||
param.value.voidConstPointerVal);
|
||||
WriteParamValueReplay<ParamType::TSemaphoreIDPointer>(
|
||||
os, call, param.value.SemaphoreIDPointerVal);
|
||||
break;
|
||||
case ParamType::TShaderProgramID:
|
||||
WriteParamValueReplay<ParamType::TShaderProgramID>(os, call,
|
||||
param.value.ShaderProgramIDVal);
|
||||
break;
|
||||
case ParamType::TShaderProgramIDConstPointer:
|
||||
WriteParamValueReplay<ParamType::TvoidConstPointer>(os, call,
|
||||
param.value.voidConstPointerVal);
|
||||
WriteParamValueReplay<ParamType::TShaderProgramIDConstPointer>(
|
||||
os, call, param.value.ShaderProgramIDConstPointerVal);
|
||||
break;
|
||||
case ParamType::TShaderProgramIDPointer:
|
||||
WriteParamValueReplay<ParamType::TvoidConstPointer>(os, call,
|
||||
param.value.voidConstPointerVal);
|
||||
WriteParamValueReplay<ParamType::TShaderProgramIDPointer>(
|
||||
os, call, param.value.ShaderProgramIDPointerVal);
|
||||
break;
|
||||
case ParamType::TShaderType:
|
||||
WriteParamValueReplay<ParamType::TShaderType>(os, call, param.value.ShaderTypeVal);
|
||||
|
@ -502,12 +501,12 @@ void WriteParamCaptureReplay(std::ostream &os, const CallCapture &call, const Pa
|
|||
WriteParamValueReplay<ParamType::TTextureID>(os, call, param.value.TextureIDVal);
|
||||
break;
|
||||
case ParamType::TTextureIDConstPointer:
|
||||
WriteParamValueReplay<ParamType::TvoidConstPointer>(os, call,
|
||||
param.value.voidConstPointerVal);
|
||||
WriteParamValueReplay<ParamType::TTextureIDConstPointer>(
|
||||
os, call, param.value.TextureIDConstPointerVal);
|
||||
break;
|
||||
case ParamType::TTextureIDPointer:
|
||||
WriteParamValueReplay<ParamType::TvoidConstPointer>(os, call,
|
||||
param.value.voidConstPointerVal);
|
||||
WriteParamValueReplay<ParamType::TTextureIDPointer>(os, call,
|
||||
param.value.TextureIDPointerVal);
|
||||
break;
|
||||
case ParamType::TTextureTarget:
|
||||
WriteParamValueReplay<ParamType::TTextureTarget>(os, call,
|
||||
|
@ -524,12 +523,12 @@ void WriteParamCaptureReplay(std::ostream &os, const CallCapture &call, const Pa
|
|||
os, call, param.value.TransformFeedbackIDVal);
|
||||
break;
|
||||
case ParamType::TTransformFeedbackIDConstPointer:
|
||||
WriteParamValueReplay<ParamType::TvoidConstPointer>(os, call,
|
||||
param.value.voidConstPointerVal);
|
||||
WriteParamValueReplay<ParamType::TTransformFeedbackIDConstPointer>(
|
||||
os, call, param.value.TransformFeedbackIDConstPointerVal);
|
||||
break;
|
||||
case ParamType::TTransformFeedbackIDPointer:
|
||||
WriteParamValueReplay<ParamType::TvoidConstPointer>(os, call,
|
||||
param.value.voidConstPointerVal);
|
||||
WriteParamValueReplay<ParamType::TTransformFeedbackIDPointer>(
|
||||
os, call, param.value.TransformFeedbackIDPointerVal);
|
||||
break;
|
||||
case ParamType::TUniformBlockIndex:
|
||||
WriteParamValueReplay<ParamType::TUniformBlockIndex>(os, call,
|
||||
|
@ -544,36 +543,35 @@ void WriteParamCaptureReplay(std::ostream &os, const CallCapture &call, const Pa
|
|||
param.value.VertexArrayIDVal);
|
||||
break;
|
||||
case ParamType::TVertexArrayIDConstPointer:
|
||||
WriteParamValueReplay<ParamType::TvoidConstPointer>(os, call,
|
||||
param.value.voidConstPointerVal);
|
||||
WriteParamValueReplay<ParamType::TVertexArrayIDConstPointer>(
|
||||
os, call, param.value.VertexArrayIDConstPointerVal);
|
||||
break;
|
||||
case ParamType::TVertexArrayIDPointer:
|
||||
WriteParamValueReplay<ParamType::TvoidConstPointer>(os, call,
|
||||
param.value.voidConstPointerVal);
|
||||
WriteParamValueReplay<ParamType::TVertexArrayIDPointer>(
|
||||
os, call, param.value.VertexArrayIDPointerVal);
|
||||
break;
|
||||
case ParamType::TVertexAttribType:
|
||||
WriteParamValueReplay<ParamType::TVertexAttribType>(os, call,
|
||||
param.value.VertexAttribTypeVal);
|
||||
break;
|
||||
case ParamType::TcharConstPointer:
|
||||
WriteParamValueReplay<ParamType::TvoidConstPointer>(os, call,
|
||||
param.value.voidConstPointerVal);
|
||||
WriteParamValueReplay<ParamType::TcharConstPointer>(os, call,
|
||||
param.value.charConstPointerVal);
|
||||
break;
|
||||
case ParamType::TvoidConstPointer:
|
||||
WriteParamValueReplay<ParamType::TvoidConstPointer>(os, call,
|
||||
param.value.voidConstPointerVal);
|
||||
break;
|
||||
case ParamType::TvoidConstPointerPointer:
|
||||
WriteParamValueReplay<ParamType::TvoidConstPointer>(os, call,
|
||||
param.value.voidConstPointerVal);
|
||||
WriteParamValueReplay<ParamType::TvoidConstPointerPointer>(
|
||||
os, call, param.value.voidConstPointerPointerVal);
|
||||
break;
|
||||
case ParamType::TvoidPointer:
|
||||
WriteParamValueReplay<ParamType::TvoidConstPointer>(os, call,
|
||||
param.value.voidConstPointerVal);
|
||||
WriteParamValueReplay<ParamType::TvoidPointer>(os, call, param.value.voidPointerVal);
|
||||
break;
|
||||
case ParamType::TvoidPointerPointer:
|
||||
WriteParamValueReplay<ParamType::TvoidConstPointer>(os, call,
|
||||
param.value.voidConstPointerVal);
|
||||
WriteParamValueReplay<ParamType::TvoidPointerPointer>(
|
||||
os, call, param.value.voidPointerPointerVal);
|
||||
break;
|
||||
default:
|
||||
os << "unknown";
|
||||
|
|
Загрузка…
Ссылка в новой задаче