Skip to content

A
angle
Commit 5dafe107 by Jamie Madill Committed by Commit Bot
Options

Output nullptr pointer parameters correctly.

Fix by piping all pointer value parameter output to const void *, which has a custom handler. This fixes a case where non-void pointers were being output as (nil) or other values. Fixes the Capture/Replay tests for many cases. Bug: angleproject:5249 Change-Id: I20c9e605d9c5a36e36e7a3d6c753a4e0de94ac4c Reviewed-on: https://chromium-review.googlesource.com/c/angle/angle/+/2497563 Commit-Queue: Jamie Madill <jmadill@chromium.org> Reviewed-by: 's avatarCody Northrop <cnorthrop@google.com> Reviewed-by: 's avatarCourtney Goeltzenleuchter <courtneygo@google.com>
parent 21add124
Showing with 129 additions and 125 deletions
scripts/code_generation_hashes/GL_EGL_entry_points.json
......@@ -6,7 +6,7 @@
"scripts/entry_point_packed_gl_enums.json":
"2d46a38023361f8e95af71042626667c",
"scripts/generate_entry_points.py":
"abdb7540d76fdf0f109f4fcc48867870",
"75138689ccfce402b1ef5a048aa490d0",
"scripts/gl.xml":
"e74a595068cbdd6064300be1e71b7cc9",
"scripts/gl_angle_ext.xml":
......@@ -96,7 +96,7 @@
"src/libANGLE/frame_capture_replay_autogen.cpp":
"09901bfdd8b16c9e888380179b53aa7a",
"src/libANGLE/frame_capture_utils_autogen.cpp":
"7a4f16a96714e43faaa0bef299ad7028",
"f9f950fc4d7388a296cba84243c38afb",
"src/libANGLE/frame_capture_utils_autogen.h":
"86e368be9083fa542a08c1c143c8b87e",
"src/libANGLE/validationES1_autogen.h":
......
scripts/generate_entry_points.py
......@@ -688,8 +688,8 @@ template_init_param_value_case = """ case ParamType::T{enum}:
SetParamVal<ParamType::T{enum}>(valueIn, valueOut);
break;"""
template_write_param_type_to_stream_case = """ case ParamType::T{enum}:
WriteParamValueReplay<ParamType::T{enum}>(os, call, param.value.{union_name});
template_write_param_type_to_stream_case = """ case ParamType::T{enum_in}:
WriteParamValueReplay<ParamType::T{enum_out}>(os, call, param.value.{union_name});
break;"""
template_param_type_to_string_case = """ case ParamType::T{enum}:
......@@ -1433,8 +1433,10 @@ 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=param_type, union_name=get_param_type_union_name(param_type))
enum_in=param_type, enum_out=param_out, union_name=get_param_type_union_name(param_out))
def get_resource_id_types(all_param_types):
......
src/libANGLE/frame_capture_utils_autogen.cpp
......@@ -30,12 +30,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::TBufferIDConstPointer>(
os, call, param.value.BufferIDConstPointerVal);
WriteParamValueReplay<ParamType::TvoidConstPointer>(os, call,
param.value.voidConstPointerVal);
break;
case ParamType::TBufferIDPointer:
WriteParamValueReplay<ParamType::TBufferIDPointer>(os, call,
param.value.BufferIDPointerVal);
WriteParamValueReplay<ParamType::TvoidConstPointer>(os, call,
param.value.voidConstPointerVal);
break;
case ParamType::TBufferUsage:
WriteParamValueReplay<ParamType::TBufferUsage>(os, call, param.value.BufferUsageVal);
......@@ -55,24 +55,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::TFenceNVIDConstPointer>(
os, call, param.value.FenceNVIDConstPointerVal);
WriteParamValueReplay<ParamType::TvoidConstPointer>(os, call,
param.value.voidConstPointerVal);
break;
case ParamType::TFenceNVIDPointer:
WriteParamValueReplay<ParamType::TFenceNVIDPointer>(os, call,
param.value.FenceNVIDPointerVal);
WriteParamValueReplay<ParamType::TvoidConstPointer>(os, call,
param.value.voidConstPointerVal);
break;
case ParamType::TFramebufferID:
WriteParamValueReplay<ParamType::TFramebufferID>(os, call,
param.value.FramebufferIDVal);
break;
case ParamType::TFramebufferIDConstPointer:
WriteParamValueReplay<ParamType::TFramebufferIDConstPointer>(
os, call, param.value.FramebufferIDConstPointerVal);
WriteParamValueReplay<ParamType::TvoidConstPointer>(os, call,
param.value.voidConstPointerVal);
break;
case ParamType::TFramebufferIDPointer:
WriteParamValueReplay<ParamType::TFramebufferIDPointer>(
os, call, param.value.FramebufferIDPointerVal);
WriteParamValueReplay<ParamType::TvoidConstPointer>(os, call,
param.value.voidConstPointerVal);
break;
case ParamType::TGLDEBUGPROC:
WriteParamValueReplay<ParamType::TGLDEBUGPROC>(os, call, param.value.GLDEBUGPROCVal);
......@@ -88,31 +88,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::TGLbooleanConstPointer>(
os, call, param.value.GLbooleanConstPointerVal);
WriteParamValueReplay<ParamType::TvoidConstPointer>(os, call,
param.value.voidConstPointerVal);
break;
case ParamType::TGLbooleanPointer:
WriteParamValueReplay<ParamType::TGLbooleanPointer>(os, call,
param.value.GLbooleanPointerVal);
WriteParamValueReplay<ParamType::TvoidConstPointer>(os, call,
param.value.voidConstPointerVal);
break;
case ParamType::TGLbyte:
WriteParamValueReplay<ParamType::TGLbyte>(os, call, param.value.GLbyteVal);
break;
case ParamType::TGLbyteConstPointer:
WriteParamValueReplay<ParamType::TGLbyteConstPointer>(
os, call, param.value.GLbyteConstPointerVal);
WriteParamValueReplay<ParamType::TvoidConstPointer>(os, call,
param.value.voidConstPointerVal);
break;
case ParamType::TGLcharConstPointer:
WriteParamValueReplay<ParamType::TGLcharConstPointer>(
os, call, param.value.GLcharConstPointerVal);
WriteParamValueReplay<ParamType::TvoidConstPointer>(os, call,
param.value.voidConstPointerVal);
break;
case ParamType::TGLcharConstPointerPointer:
WriteParamValueReplay<ParamType::TGLcharConstPointerPointer>(
os, call, param.value.GLcharConstPointerPointerVal);
WriteParamValueReplay<ParamType::TvoidConstPointer>(os, call,
param.value.voidConstPointerVal);
break;
case ParamType::TGLcharPointer:
WriteParamValueReplay<ParamType::TGLcharPointer>(os, call,
param.value.GLcharPointerVal);
WriteParamValueReplay<ParamType::TvoidConstPointer>(os, call,
param.value.voidConstPointerVal);
break;
case ParamType::TGLclampx:
WriteParamValueReplay<ParamType::TGLclampx>(os, call, param.value.GLclampxVal);
......@@ -121,12 +121,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::TGLdoubleConstPointer>(
os, call, param.value.GLdoubleConstPointerVal);
WriteParamValueReplay<ParamType::TvoidConstPointer>(os, call,
param.value.voidConstPointerVal);
break;
case ParamType::TGLdoublePointer:
WriteParamValueReplay<ParamType::TGLdoublePointer>(os, call,
param.value.GLdoublePointerVal);
WriteParamValueReplay<ParamType::TvoidConstPointer>(os, call,
param.value.voidConstPointerVal);
break;
case ParamType::TGLeglImageOES:
WriteParamValueReplay<ParamType::TGLeglImageOES>(os, call,
......@@ -136,80 +136,81 @@ void WriteParamCaptureReplay(std::ostream &os, const CallCapture &call, const Pa
WriteParamValueReplay<ParamType::TGLenum>(os, call, param.value.GLenumVal);
break;
case ParamType::TGLenumConstPointer:
WriteParamValueReplay<ParamType::TGLenumConstPointer>(
os, call, param.value.GLenumConstPointerVal);
WriteParamValueReplay<ParamType::TvoidConstPointer>(os, call,
param.value.voidConstPointerVal);
break;
case ParamType::TGLenumPointer:
WriteParamValueReplay<ParamType::TGLenumPointer>(os, call,
param.value.GLenumPointerVal);
WriteParamValueReplay<ParamType::TvoidConstPointer>(os, call,
param.value.voidConstPointerVal);
break;
case ParamType::TGLfixed:
WriteParamValueReplay<ParamType::TGLfixed>(os, call, param.value.GLfixedVal);
break;
case ParamType::TGLfixedConstPointer:
WriteParamValueReplay<ParamType::TGLfixedConstPointer>(
os, call, param.value.GLfixedConstPointerVal);
WriteParamValueReplay<ParamType::TvoidConstPointer>(os, call,
param.value.voidConstPointerVal);
break;
case ParamType::TGLfixedPointer:
WriteParamValueReplay<ParamType::TGLfixedPointer>(os, call,
param.value.GLfixedPointerVal);
WriteParamValueReplay<ParamType::TvoidConstPointer>(os, call,
param.value.voidConstPointerVal);
break;
case ParamType::TGLfloat:
WriteParamValueReplay<ParamType::TGLfloat>(os, call, param.value.GLfloatVal);
break;
case ParamType::TGLfloatConstPointer:
WriteParamValueReplay<ParamType::TGLfloatConstPointer>(
os, call, param.value.GLfloatConstPointerVal);
WriteParamValueReplay<ParamType::TvoidConstPointer>(os, call,
param.value.voidConstPointerVal);
break;
case ParamType::TGLfloatPointer:
WriteParamValueReplay<ParamType::TGLfloatPointer>(os, call,
param.value.GLfloatPointerVal);
WriteParamValueReplay<ParamType::TvoidConstPointer>(os, call,
param.value.voidConstPointerVal);
break;
case ParamType::TGLint:
WriteParamValueReplay<ParamType::TGLint>(os, call, param.value.GLintVal);
break;
case ParamType::TGLint64Pointer:
WriteParamValueReplay<ParamType::TGLint64Pointer>(os, call,
param.value.GLint64PointerVal);
WriteParamValueReplay<ParamType::TvoidConstPointer>(os, call,
param.value.voidConstPointerVal);
break;
case ParamType::TGLintConstPointer:
WriteParamValueReplay<ParamType::TGLintConstPointer>(os, call,
param.value.GLintConstPointerVal);
WriteParamValueReplay<ParamType::TvoidConstPointer>(os, call,
param.value.voidConstPointerVal);
break;
case ParamType::TGLintPointer:
WriteParamValueReplay<ParamType::TGLintPointer>(os, call, param.value.GLintPointerVal);
WriteParamValueReplay<ParamType::TvoidConstPointer>(os, call,
param.value.voidConstPointerVal);
break;
case ParamType::TGLintptr:
WriteParamValueReplay<ParamType::TGLintptr>(os, call, param.value.GLintptrVal);
break;
case ParamType::TGLintptrConstPointer:
WriteParamValueReplay<ParamType::TGLintptrConstPointer>(
os, call, param.value.GLintptrConstPointerVal);
WriteParamValueReplay<ParamType::TvoidConstPointer>(os, call,
param.value.voidConstPointerVal);
break;
case ParamType::TGLshort:
WriteParamValueReplay<ParamType::TGLshort>(os, call, param.value.GLshortVal);
break;
case ParamType::TGLshortConstPointer:
WriteParamValueReplay<ParamType::TGLshortConstPointer>(
os, call, param.value.GLshortConstPointerVal);
WriteParamValueReplay<ParamType::TvoidConstPointer>(os, call,
param.value.voidConstPointerVal);
break;
case ParamType::TGLsizei:
WriteParamValueReplay<ParamType::TGLsizei>(os, call, param.value.GLsizeiVal);
break;
case ParamType::TGLsizeiConstPointer:
WriteParamValueReplay<ParamType::TGLsizeiConstPointer>(
os, call, param.value.GLsizeiConstPointerVal);
WriteParamValueReplay<ParamType::TvoidConstPointer>(os, call,
param.value.voidConstPointerVal);
break;
case ParamType::TGLsizeiPointer:
WriteParamValueReplay<ParamType::TGLsizeiPointer>(os, call,
param.value.GLsizeiPointerVal);
WriteParamValueReplay<ParamType::TvoidConstPointer>(os, call,
param.value.voidConstPointerVal);
break;
case ParamType::TGLsizeiptr:
WriteParamValueReplay<ParamType::TGLsizeiptr>(os, call, param.value.GLsizeiptrVal);
break;
case ParamType::TGLsizeiptrConstPointer:
WriteParamValueReplay<ParamType::TGLsizeiptrConstPointer>(
os, call, param.value.GLsizeiptrConstPointerVal);
WriteParamValueReplay<ParamType::TvoidConstPointer>(os, call,
param.value.voidConstPointerVal);
break;
case ParamType::TGLsync:
WriteParamValueReplay<ParamType::TGLsync>(os, call, param.value.GLsyncVal);
......@@ -218,12 +219,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::TGLubyteConstPointer>(
os, call, param.value.GLubyteConstPointerVal);
WriteParamValueReplay<ParamType::TvoidConstPointer>(os, call,
param.value.voidConstPointerVal);
break;
case ParamType::TGLubytePointer:
WriteParamValueReplay<ParamType::TGLubytePointer>(os, call,
param.value.GLubytePointerVal);
WriteParamValueReplay<ParamType::TvoidConstPointer>(os, call,
param.value.voidConstPointerVal);
break;
case ParamType::TGLuint:
WriteParamValueReplay<ParamType::TGLuint>(os, call, param.value.GLuintVal);
......@@ -232,39 +233,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::TGLuint64ConstPointer>(
os, call, param.value.GLuint64ConstPointerVal);
WriteParamValueReplay<ParamType::TvoidConstPointer>(os, call,
param.value.voidConstPointerVal);
break;
case ParamType::TGLuint64Pointer:
WriteParamValueReplay<ParamType::TGLuint64Pointer>(os, call,
param.value.GLuint64PointerVal);
WriteParamValueReplay<ParamType::TvoidConstPointer>(os, call,
param.value.voidConstPointerVal);
break;
case ParamType::TGLuintConstPointer:
WriteParamValueReplay<ParamType::TGLuintConstPointer>(
os, call, param.value.GLuintConstPointerVal);
WriteParamValueReplay<ParamType::TvoidConstPointer>(os, call,
param.value.voidConstPointerVal);
break;
case ParamType::TGLuintPointer:
WriteParamValueReplay<ParamType::TGLuintPointer>(os, call,
param.value.GLuintPointerVal);
WriteParamValueReplay<ParamType::TvoidConstPointer>(os, call,
param.value.voidConstPointerVal);
break;
case ParamType::TGLushort:
WriteParamValueReplay<ParamType::TGLushort>(os, call, param.value.GLushortVal);
break;
case ParamType::TGLushortConstPointer:
WriteParamValueReplay<ParamType::TGLushortConstPointer>(
os, call, param.value.GLushortConstPointerVal);
WriteParamValueReplay<ParamType::TvoidConstPointer>(os, call,
param.value.voidConstPointerVal);
break;
case ParamType::TGLushortPointer:
WriteParamValueReplay<ParamType::TGLushortPointer>(os, call,
param.value.GLushortPointerVal);
WriteParamValueReplay<ParamType::TvoidConstPointer>(os, call,
param.value.voidConstPointerVal);
break;
case ParamType::TGLvoidConstPointer:
WriteParamValueReplay<ParamType::TGLvoidConstPointer>(
os, call, param.value.GLvoidConstPointerVal);
WriteParamValueReplay<ParamType::TvoidConstPointer>(os, call,
param.value.voidConstPointerVal);
break;
case ParamType::TGLvoidConstPointerPointer:
WriteParamValueReplay<ParamType::TGLvoidConstPointerPointer>(
os, call, param.value.GLvoidConstPointerPointerVal);
WriteParamValueReplay<ParamType::TvoidConstPointer>(os, call,
param.value.voidConstPointerVal);
break;
case ParamType::TGraphicsResetStatus:
WriteParamValueReplay<ParamType::TGraphicsResetStatus>(
......@@ -293,12 +294,12 @@ void WriteParamCaptureReplay(std::ostream &os, const CallCapture &call, const Pa
param.value.MemoryObjectIDVal);
break;
case ParamType::TMemoryObjectIDConstPointer:
WriteParamValueReplay<ParamType::TMemoryObjectIDConstPointer>(
os, call, param.value.MemoryObjectIDConstPointerVal);
WriteParamValueReplay<ParamType::TvoidConstPointer>(os, call,
param.value.voidConstPointerVal);
break;
case ParamType::TMemoryObjectIDPointer:
WriteParamValueReplay<ParamType::TMemoryObjectIDPointer>(
os, call, param.value.MemoryObjectIDPointerVal);
WriteParamValueReplay<ParamType::TvoidConstPointer>(os, call,
param.value.voidConstPointerVal);
break;
case ParamType::TPointParameter:
WriteParamValueReplay<ParamType::TPointParameter>(os, call,
......@@ -313,12 +314,12 @@ void WriteParamCaptureReplay(std::ostream &os, const CallCapture &call, const Pa
param.value.ProgramPipelineIDVal);
break;
case ParamType::TProgramPipelineIDConstPointer:
WriteParamValueReplay<ParamType::TProgramPipelineIDConstPointer>(
os, call, param.value.ProgramPipelineIDConstPointerVal);
WriteParamValueReplay<ParamType::TvoidConstPointer>(os, call,
param.value.voidConstPointerVal);
break;
case ParamType::TProgramPipelineIDPointer:
WriteParamValueReplay<ParamType::TProgramPipelineIDPointer>(
os, call, param.value.ProgramPipelineIDPointerVal);
WriteParamValueReplay<ParamType::TvoidConstPointer>(os, call,
param.value.voidConstPointerVal);
break;
case ParamType::TProvokingVertexConvention:
WriteParamValueReplay<ParamType::TProvokingVertexConvention>(
......@@ -328,12 +329,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::TQueryIDConstPointer>(
os, call, param.value.QueryIDConstPointerVal);
WriteParamValueReplay<ParamType::TvoidConstPointer>(os, call,
param.value.voidConstPointerVal);
break;
case ParamType::TQueryIDPointer:
WriteParamValueReplay<ParamType::TQueryIDPointer>(os, call,
param.value.QueryIDPointerVal);
WriteParamValueReplay<ParamType::TvoidConstPointer>(os, call,
param.value.voidConstPointerVal);
break;
case ParamType::TQueryType:
WriteParamValueReplay<ParamType::TQueryType>(os, call, param.value.QueryTypeVal);
......@@ -343,46 +344,46 @@ void WriteParamCaptureReplay(std::ostream &os, const CallCapture &call, const Pa
param.value.RenderbufferIDVal);
break;
case ParamType::TRenderbufferIDConstPointer:
WriteParamValueReplay<ParamType::TRenderbufferIDConstPointer>(
os, call, param.value.RenderbufferIDConstPointerVal);
WriteParamValueReplay<ParamType::TvoidConstPointer>(os, call,
param.value.voidConstPointerVal);
break;
case ParamType::TRenderbufferIDPointer:
WriteParamValueReplay<ParamType::TRenderbufferIDPointer>(
os, call, param.value.RenderbufferIDPointerVal);
WriteParamValueReplay<ParamType::TvoidConstPointer>(os, call,
param.value.voidConstPointerVal);
break;
case ParamType::TSamplerID:
WriteParamValueReplay<ParamType::TSamplerID>(os, call, param.value.SamplerIDVal);
break;
case ParamType::TSamplerIDConstPointer:
WriteParamValueReplay<ParamType::TSamplerIDConstPointer>(
os, call, param.value.SamplerIDConstPointerVal);
WriteParamValueReplay<ParamType::TvoidConstPointer>(os, call,
param.value.voidConstPointerVal);
break;
case ParamType::TSamplerIDPointer:
WriteParamValueReplay<ParamType::TSamplerIDPointer>(os, call,
param.value.SamplerIDPointerVal);
WriteParamValueReplay<ParamType::TvoidConstPointer>(os, call,
param.value.voidConstPointerVal);
break;
case ParamType::TSemaphoreID:
WriteParamValueReplay<ParamType::TSemaphoreID>(os, call, param.value.SemaphoreIDVal);
break;
case ParamType::TSemaphoreIDConstPointer:
WriteParamValueReplay<ParamType::TSemaphoreIDConstPointer>(
os, call, param.value.SemaphoreIDConstPointerVal);
WriteParamValueReplay<ParamType::TvoidConstPointer>(os, call,
param.value.voidConstPointerVal);
break;
case ParamType::TSemaphoreIDPointer:
WriteParamValueReplay<ParamType::TSemaphoreIDPointer>(
os, call, param.value.SemaphoreIDPointerVal);
WriteParamValueReplay<ParamType::TvoidConstPointer>(os, call,
param.value.voidConstPointerVal);
break;
case ParamType::TShaderProgramID:
WriteParamValueReplay<ParamType::TShaderProgramID>(os, call,
param.value.ShaderProgramIDVal);
break;
case ParamType::TShaderProgramIDConstPointer:
WriteParamValueReplay<ParamType::TShaderProgramIDConstPointer>(
os, call, param.value.ShaderProgramIDConstPointerVal);
WriteParamValueReplay<ParamType::TvoidConstPointer>(os, call,
param.value.voidConstPointerVal);
break;
case ParamType::TShaderProgramIDPointer:
WriteParamValueReplay<ParamType::TShaderProgramIDPointer>(
os, call, param.value.ShaderProgramIDPointerVal);
WriteParamValueReplay<ParamType::TvoidConstPointer>(os, call,
param.value.voidConstPointerVal);
break;
case ParamType::TShaderType:
WriteParamValueReplay<ParamType::TShaderType>(os, call, param.value.ShaderTypeVal);
......@@ -402,12 +403,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::TTextureIDConstPointer>(
os, call, param.value.TextureIDConstPointerVal);
WriteParamValueReplay<ParamType::TvoidConstPointer>(os, call,
param.value.voidConstPointerVal);
break;
case ParamType::TTextureIDPointer:
WriteParamValueReplay<ParamType::TTextureIDPointer>(os, call,
param.value.TextureIDPointerVal);
WriteParamValueReplay<ParamType::TvoidConstPointer>(os, call,
param.value.voidConstPointerVal);
break;
case ParamType::TTextureTarget:
WriteParamValueReplay<ParamType::TTextureTarget>(os, call,
......@@ -421,12 +422,12 @@ void WriteParamCaptureReplay(std::ostream &os, const CallCapture &call, const Pa
os, call, param.value.TransformFeedbackIDVal);
break;
case ParamType::TTransformFeedbackIDConstPointer:
WriteParamValueReplay<ParamType::TTransformFeedbackIDConstPointer>(
os, call, param.value.TransformFeedbackIDConstPointerVal);
WriteParamValueReplay<ParamType::TvoidConstPointer>(os, call,
param.value.voidConstPointerVal);
break;
case ParamType::TTransformFeedbackIDPointer:
WriteParamValueReplay<ParamType::TTransformFeedbackIDPointer>(
os, call, param.value.TransformFeedbackIDPointerVal);
WriteParamValueReplay<ParamType::TvoidConstPointer>(os, call,
param.value.voidConstPointerVal);
break;
case ParamType::TUniformLocation:
WriteParamValueReplay<ParamType::TUniformLocation>(os, call,
......@@ -437,12 +438,12 @@ void WriteParamCaptureReplay(std::ostream &os, const CallCapture &call, const Pa
param.value.VertexArrayIDVal);
break;
case ParamType::TVertexArrayIDConstPointer:
WriteParamValueReplay<ParamType::TVertexArrayIDConstPointer>(
os, call, param.value.VertexArrayIDConstPointerVal);
WriteParamValueReplay<ParamType::TvoidConstPointer>(os, call,
param.value.voidConstPointerVal);
break;
case ParamType::TVertexArrayIDPointer:
WriteParamValueReplay<ParamType::TVertexArrayIDPointer>(
os, call, param.value.VertexArrayIDPointerVal);
WriteParamValueReplay<ParamType::TvoidConstPointer>(os, call,
param.value.voidConstPointerVal);
break;
case ParamType::TVertexAttribType:
WriteParamValueReplay<ParamType::TVertexAttribType>(os, call,
......@@ -453,15 +454,16 @@ void WriteParamCaptureReplay(std::ostream &os, const CallCapture &call, const Pa
param.value.voidConstPointerVal);
break;
case ParamType::TvoidConstPointerPointer:
WriteParamValueReplay<ParamType::TvoidConstPointerPointer>(
os, call, param.value.voidConstPointerPointerVal);
WriteParamValueReplay<ParamType::TvoidConstPointer>(os, call,
param.value.voidConstPointerVal);
break;
case ParamType::TvoidPointer:
WriteParamValueReplay<ParamType::TvoidPointer>(os, call, param.value.voidPointerVal);
WriteParamValueReplay<ParamType::TvoidConstPointer>(os, call,
param.value.voidConstPointerVal);
break;
case ParamType::TvoidPointerPointer:
WriteParamValueReplay<ParamType::TvoidPointerPointer>(
os, call, param.value.voidPointerPointerVal);
WriteParamValueReplay<ParamType::TvoidConstPointer>(os, call,
param.value.voidConstPointerVal);
break;
default:
os << "unknown";
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment