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 @@ ...@@ -6,7 +6,7 @@
"scripts/entry_point_packed_gl_enums.json": "scripts/entry_point_packed_gl_enums.json":
"2d46a38023361f8e95af71042626667c", "2d46a38023361f8e95af71042626667c",
"scripts/generate_entry_points.py": "scripts/generate_entry_points.py":
"abdb7540d76fdf0f109f4fcc48867870", "75138689ccfce402b1ef5a048aa490d0",
"scripts/gl.xml": "scripts/gl.xml":
"e74a595068cbdd6064300be1e71b7cc9", "e74a595068cbdd6064300be1e71b7cc9",
"scripts/gl_angle_ext.xml": "scripts/gl_angle_ext.xml":
...@@ -96,7 +96,7 @@ ...@@ -96,7 +96,7 @@
"src/libANGLE/frame_capture_replay_autogen.cpp": "src/libANGLE/frame_capture_replay_autogen.cpp":
"09901bfdd8b16c9e888380179b53aa7a", "09901bfdd8b16c9e888380179b53aa7a",
"src/libANGLE/frame_capture_utils_autogen.cpp": "src/libANGLE/frame_capture_utils_autogen.cpp":
"7a4f16a96714e43faaa0bef299ad7028", "f9f950fc4d7388a296cba84243c38afb",
"src/libANGLE/frame_capture_utils_autogen.h": "src/libANGLE/frame_capture_utils_autogen.h":
"86e368be9083fa542a08c1c143c8b87e", "86e368be9083fa542a08c1c143c8b87e",
"src/libANGLE/validationES1_autogen.h": "src/libANGLE/validationES1_autogen.h":
......
scripts/generate_entry_points.py
...@@ -688,8 +688,8 @@ template_init_param_value_case = """ case ParamType::T{enum}: ...@@ -688,8 +688,8 @@ template_init_param_value_case = """ case ParamType::T{enum}:
SetParamVal<ParamType::T{enum}>(valueIn, valueOut); SetParamVal<ParamType::T{enum}>(valueIn, valueOut);
break;""" break;"""
template_write_param_type_to_stream_case = """ case ParamType::T{enum}: template_write_param_type_to_stream_case = """ case ParamType::T{enum_in}:
WriteParamValueReplay<ParamType::T{enum}>(os, call, param.value.{union_name}); WriteParamValueReplay<ParamType::T{enum_out}>(os, call, param.value.{union_name});
break;""" break;"""
template_param_type_to_string_case = """ case ParamType::T{enum}: template_param_type_to_string_case = """ case ParamType::T{enum}:
...@@ -1433,8 +1433,10 @@ def format_init_param_value_case(param_type): ...@@ -1433,8 +1433,10 @@ def format_init_param_value_case(param_type):
def format_write_param_type_to_stream_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( 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): 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 ...@@ -30,12 +30,12 @@ void WriteParamCaptureReplay(std::ostream &os, const CallCapture &call, const Pa
WriteParamValueReplay<ParamType::TBufferID>(os, call, param.value.BufferIDVal); WriteParamValueReplay<ParamType::TBufferID>(os, call, param.value.BufferIDVal);
break; break;
case ParamType::TBufferIDConstPointer: case ParamType::TBufferIDConstPointer:
WriteParamValueReplay<ParamType::TBufferIDConstPointer>( WriteParamValueReplay<ParamType::TvoidConstPointer>(os, call,
os, call, param.value.BufferIDConstPointerVal); param.value.voidConstPointerVal);
break; break;
case ParamType::TBufferIDPointer: case ParamType::TBufferIDPointer:
WriteParamValueReplay<ParamType::TBufferIDPointer>(os, call, WriteParamValueReplay<ParamType::TvoidConstPointer>(os, call,
param.value.BufferIDPointerVal); param.value.voidConstPointerVal);
break; break;
case ParamType::TBufferUsage: case ParamType::TBufferUsage:
WriteParamValueReplay<ParamType::TBufferUsage>(os, call, param.value.BufferUsageVal); WriteParamValueReplay<ParamType::TBufferUsage>(os, call, param.value.BufferUsageVal);
...@@ -55,24 +55,24 @@ void WriteParamCaptureReplay(std::ostream &os, const CallCapture &call, const Pa ...@@ -55,24 +55,24 @@ void WriteParamCaptureReplay(std::ostream &os, const CallCapture &call, const Pa
WriteParamValueReplay<ParamType::TFenceNVID>(os, call, param.value.FenceNVIDVal); WriteParamValueReplay<ParamType::TFenceNVID>(os, call, param.value.FenceNVIDVal);
break; break;
case ParamType::TFenceNVIDConstPointer: case ParamType::TFenceNVIDConstPointer:
WriteParamValueReplay<ParamType::TFenceNVIDConstPointer>( WriteParamValueReplay<ParamType::TvoidConstPointer>(os, call,
os, call, param.value.FenceNVIDConstPointerVal); param.value.voidConstPointerVal);
break; break;
case ParamType::TFenceNVIDPointer: case ParamType::TFenceNVIDPointer:
WriteParamValueReplay<ParamType::TFenceNVIDPointer>(os, call, WriteParamValueReplay<ParamType::TvoidConstPointer>(os, call,
param.value.FenceNVIDPointerVal); param.value.voidConstPointerVal);
break; break;
case ParamType::TFramebufferID: case ParamType::TFramebufferID:
WriteParamValueReplay<ParamType::TFramebufferID>(os, call, WriteParamValueReplay<ParamType::TFramebufferID>(os, call,
param.value.FramebufferIDVal); param.value.FramebufferIDVal);
break; break;
case ParamType::TFramebufferIDConstPointer: case ParamType::TFramebufferIDConstPointer:
WriteParamValueReplay<ParamType::TFramebufferIDConstPointer>( WriteParamValueReplay<ParamType::TvoidConstPointer>(os, call,
os, call, param.value.FramebufferIDConstPointerVal); param.value.voidConstPointerVal);
break; break;
case ParamType::TFramebufferIDPointer: case ParamType::TFramebufferIDPointer:
WriteParamValueReplay<ParamType::TFramebufferIDPointer>( WriteParamValueReplay<ParamType::TvoidConstPointer>(os, call,
os, call, param.value.FramebufferIDPointerVal); param.value.voidConstPointerVal);
break; break;
case ParamType::TGLDEBUGPROC: case ParamType::TGLDEBUGPROC:
WriteParamValueReplay<ParamType::TGLDEBUGPROC>(os, call, param.value.GLDEBUGPROCVal); WriteParamValueReplay<ParamType::TGLDEBUGPROC>(os, call, param.value.GLDEBUGPROCVal);
...@@ -88,31 +88,31 @@ void WriteParamCaptureReplay(std::ostream &os, const CallCapture &call, const Pa ...@@ -88,31 +88,31 @@ void WriteParamCaptureReplay(std::ostream &os, const CallCapture &call, const Pa
WriteParamValueReplay<ParamType::TGLboolean>(os, call, param.value.GLbooleanVal); WriteParamValueReplay<ParamType::TGLboolean>(os, call, param.value.GLbooleanVal);
break; break;
case ParamType::TGLbooleanConstPointer: case ParamType::TGLbooleanConstPointer:
WriteParamValueReplay<ParamType::TGLbooleanConstPointer>( WriteParamValueReplay<ParamType::TvoidConstPointer>(os, call,
os, call, param.value.GLbooleanConstPointerVal); param.value.voidConstPointerVal);
break; break;
case ParamType::TGLbooleanPointer: case ParamType::TGLbooleanPointer:
WriteParamValueReplay<ParamType::TGLbooleanPointer>(os, call, WriteParamValueReplay<ParamType::TvoidConstPointer>(os, call,
param.value.GLbooleanPointerVal); param.value.voidConstPointerVal);
break; break;
case ParamType::TGLbyte: case ParamType::TGLbyte:
WriteParamValueReplay<ParamType::TGLbyte>(os, call, param.value.GLbyteVal); WriteParamValueReplay<ParamType::TGLbyte>(os, call, param.value.GLbyteVal);
break; break;
case ParamType::TGLbyteConstPointer: case ParamType::TGLbyteConstPointer:
WriteParamValueReplay<ParamType::TGLbyteConstPointer>( WriteParamValueReplay<ParamType::TvoidConstPointer>(os, call,
os, call, param.value.GLbyteConstPointerVal); param.value.voidConstPointerVal);
break; break;
case ParamType::TGLcharConstPointer: case ParamType::TGLcharConstPointer:
WriteParamValueReplay<ParamType::TGLcharConstPointer>( WriteParamValueReplay<ParamType::TvoidConstPointer>(os, call,
os, call, param.value.GLcharConstPointerVal); param.value.voidConstPointerVal);
break; break;
case ParamType::TGLcharConstPointerPointer: case ParamType::TGLcharConstPointerPointer:
WriteParamValueReplay<ParamType::TGLcharConstPointerPointer>( WriteParamValueReplay<ParamType::TvoidConstPointer>(os, call,
os, call, param.value.GLcharConstPointerPointerVal); param.value.voidConstPointerVal);
break; break;
case ParamType::TGLcharPointer: case ParamType::TGLcharPointer:
WriteParamValueReplay<ParamType::TGLcharPointer>(os, call, WriteParamValueReplay<ParamType::TvoidConstPointer>(os, call,
param.value.GLcharPointerVal); param.value.voidConstPointerVal);
break; break;
case ParamType::TGLclampx: case ParamType::TGLclampx:
WriteParamValueReplay<ParamType::TGLclampx>(os, call, param.value.GLclampxVal); WriteParamValueReplay<ParamType::TGLclampx>(os, call, param.value.GLclampxVal);
...@@ -121,12 +121,12 @@ void WriteParamCaptureReplay(std::ostream &os, const CallCapture &call, const Pa ...@@ -121,12 +121,12 @@ void WriteParamCaptureReplay(std::ostream &os, const CallCapture &call, const Pa
WriteParamValueReplay<ParamType::TGLdouble>(os, call, param.value.GLdoubleVal); WriteParamValueReplay<ParamType::TGLdouble>(os, call, param.value.GLdoubleVal);
break; break;
case ParamType::TGLdoubleConstPointer: case ParamType::TGLdoubleConstPointer:
WriteParamValueReplay<ParamType::TGLdoubleConstPointer>( WriteParamValueReplay<ParamType::TvoidConstPointer>(os, call,
os, call, param.value.GLdoubleConstPointerVal); param.value.voidConstPointerVal);
break; break;
case ParamType::TGLdoublePointer: case ParamType::TGLdoublePointer:
WriteParamValueReplay<ParamType::TGLdoublePointer>(os, call, WriteParamValueReplay<ParamType::TvoidConstPointer>(os, call,
param.value.GLdoublePointerVal); param.value.voidConstPointerVal);
break; break;
case ParamType::TGLeglImageOES: case ParamType::TGLeglImageOES:
WriteParamValueReplay<ParamType::TGLeglImageOES>(os, call, WriteParamValueReplay<ParamType::TGLeglImageOES>(os, call,
...@@ -136,80 +136,81 @@ void WriteParamCaptureReplay(std::ostream &os, const CallCapture &call, const Pa ...@@ -136,80 +136,81 @@ void WriteParamCaptureReplay(std::ostream &os, const CallCapture &call, const Pa
WriteParamValueReplay<ParamType::TGLenum>(os, call, param.value.GLenumVal); WriteParamValueReplay<ParamType::TGLenum>(os, call, param.value.GLenumVal);
break; break;
case ParamType::TGLenumConstPointer: case ParamType::TGLenumConstPointer:
WriteParamValueReplay<ParamType::TGLenumConstPointer>( WriteParamValueReplay<ParamType::TvoidConstPointer>(os, call,
os, call, param.value.GLenumConstPointerVal); param.value.voidConstPointerVal);
break; break;
case ParamType::TGLenumPointer: case ParamType::TGLenumPointer:
WriteParamValueReplay<ParamType::TGLenumPointer>(os, call, WriteParamValueReplay<ParamType::TvoidConstPointer>(os, call,
param.value.GLenumPointerVal); param.value.voidConstPointerVal);
break; break;
case ParamType::TGLfixed: case ParamType::TGLfixed:
WriteParamValueReplay<ParamType::TGLfixed>(os, call, param.value.GLfixedVal); WriteParamValueReplay<ParamType::TGLfixed>(os, call, param.value.GLfixedVal);
break; break;
case ParamType::TGLfixedConstPointer: case ParamType::TGLfixedConstPointer:
WriteParamValueReplay<ParamType::TGLfixedConstPointer>( WriteParamValueReplay<ParamType::TvoidConstPointer>(os, call,
os, call, param.value.GLfixedConstPointerVal); param.value.voidConstPointerVal);
break; break;
case ParamType::TGLfixedPointer: case ParamType::TGLfixedPointer:
WriteParamValueReplay<ParamType::TGLfixedPointer>(os, call, WriteParamValueReplay<ParamType::TvoidConstPointer>(os, call,
param.value.GLfixedPointerVal); param.value.voidConstPointerVal);
break; break;
case ParamType::TGLfloat: case ParamType::TGLfloat:
WriteParamValueReplay<ParamType::TGLfloat>(os, call, param.value.GLfloatVal); WriteParamValueReplay<ParamType::TGLfloat>(os, call, param.value.GLfloatVal);
break; break;
case ParamType::TGLfloatConstPointer: case ParamType::TGLfloatConstPointer:
WriteParamValueReplay<ParamType::TGLfloatConstPointer>( WriteParamValueReplay<ParamType::TvoidConstPointer>(os, call,
os, call, param.value.GLfloatConstPointerVal); param.value.voidConstPointerVal);
break; break;
case ParamType::TGLfloatPointer: case ParamType::TGLfloatPointer:
WriteParamValueReplay<ParamType::TGLfloatPointer>(os, call, WriteParamValueReplay<ParamType::TvoidConstPointer>(os, call,
param.value.GLfloatPointerVal); param.value.voidConstPointerVal);
break; break;
case ParamType::TGLint: case ParamType::TGLint:
WriteParamValueReplay<ParamType::TGLint>(os, call, param.value.GLintVal); WriteParamValueReplay<ParamType::TGLint>(os, call, param.value.GLintVal);
break; break;
case ParamType::TGLint64Pointer: case ParamType::TGLint64Pointer:
WriteParamValueReplay<ParamType::TGLint64Pointer>(os, call, WriteParamValueReplay<ParamType::TvoidConstPointer>(os, call,
param.value.GLint64PointerVal); param.value.voidConstPointerVal);
break; break;
case ParamType::TGLintConstPointer: case ParamType::TGLintConstPointer:
WriteParamValueReplay<ParamType::TGLintConstPointer>(os, call, WriteParamValueReplay<ParamType::TvoidConstPointer>(os, call,
param.value.GLintConstPointerVal); param.value.voidConstPointerVal);
break; break;
case ParamType::TGLintPointer: case ParamType::TGLintPointer:
WriteParamValueReplay<ParamType::TGLintPointer>(os, call, param.value.GLintPointerVal); WriteParamValueReplay<ParamType::TvoidConstPointer>(os, call,
param.value.voidConstPointerVal);
break; break;
case ParamType::TGLintptr: case ParamType::TGLintptr:
WriteParamValueReplay<ParamType::TGLintptr>(os, call, param.value.GLintptrVal); WriteParamValueReplay<ParamType::TGLintptr>(os, call, param.value.GLintptrVal);
break; break;
case ParamType::TGLintptrConstPointer: case ParamType::TGLintptrConstPointer:
WriteParamValueReplay<ParamType::TGLintptrConstPointer>( WriteParamValueReplay<ParamType::TvoidConstPointer>(os, call,
os, call, param.value.GLintptrConstPointerVal); param.value.voidConstPointerVal);
break; break;
case ParamType::TGLshort: case ParamType::TGLshort:
WriteParamValueReplay<ParamType::TGLshort>(os, call, param.value.GLshortVal); WriteParamValueReplay<ParamType::TGLshort>(os, call, param.value.GLshortVal);
break; break;
case ParamType::TGLshortConstPointer: case ParamType::TGLshortConstPointer:
WriteParamValueReplay<ParamType::TGLshortConstPointer>( WriteParamValueReplay<ParamType::TvoidConstPointer>(os, call,
os, call, param.value.GLshortConstPointerVal); param.value.voidConstPointerVal);
break; break;
case ParamType::TGLsizei: case ParamType::TGLsizei:
WriteParamValueReplay<ParamType::TGLsizei>(os, call, param.value.GLsizeiVal); WriteParamValueReplay<ParamType::TGLsizei>(os, call, param.value.GLsizeiVal);
break; break;
case ParamType::TGLsizeiConstPointer: case ParamType::TGLsizeiConstPointer:
WriteParamValueReplay<ParamType::TGLsizeiConstPointer>( WriteParamValueReplay<ParamType::TvoidConstPointer>(os, call,
os, call, param.value.GLsizeiConstPointerVal); param.value.voidConstPointerVal);
break; break;
case ParamType::TGLsizeiPointer: case ParamType::TGLsizeiPointer:
WriteParamValueReplay<ParamType::TGLsizeiPointer>(os, call, WriteParamValueReplay<ParamType::TvoidConstPointer>(os, call,
param.value.GLsizeiPointerVal); param.value.voidConstPointerVal);
break; break;
case ParamType::TGLsizeiptr: case ParamType::TGLsizeiptr:
WriteParamValueReplay<ParamType::TGLsizeiptr>(os, call, param.value.GLsizeiptrVal); WriteParamValueReplay<ParamType::TGLsizeiptr>(os, call, param.value.GLsizeiptrVal);
break; break;
case ParamType::TGLsizeiptrConstPointer: case ParamType::TGLsizeiptrConstPointer:
WriteParamValueReplay<ParamType::TGLsizeiptrConstPointer>( WriteParamValueReplay<ParamType::TvoidConstPointer>(os, call,
os, call, param.value.GLsizeiptrConstPointerVal); param.value.voidConstPointerVal);
break; break;
case ParamType::TGLsync: case ParamType::TGLsync:
WriteParamValueReplay<ParamType::TGLsync>(os, call, param.value.GLsyncVal); WriteParamValueReplay<ParamType::TGLsync>(os, call, param.value.GLsyncVal);
...@@ -218,12 +219,12 @@ void WriteParamCaptureReplay(std::ostream &os, const CallCapture &call, const Pa ...@@ -218,12 +219,12 @@ void WriteParamCaptureReplay(std::ostream &os, const CallCapture &call, const Pa
WriteParamValueReplay<ParamType::TGLubyte>(os, call, param.value.GLubyteVal); WriteParamValueReplay<ParamType::TGLubyte>(os, call, param.value.GLubyteVal);
break; break;
case ParamType::TGLubyteConstPointer: case ParamType::TGLubyteConstPointer:
WriteParamValueReplay<ParamType::TGLubyteConstPointer>( WriteParamValueReplay<ParamType::TvoidConstPointer>(os, call,
os, call, param.value.GLubyteConstPointerVal); param.value.voidConstPointerVal);
break; break;
case ParamType::TGLubytePointer: case ParamType::TGLubytePointer:
WriteParamValueReplay<ParamType::TGLubytePointer>(os, call, WriteParamValueReplay<ParamType::TvoidConstPointer>(os, call,
param.value.GLubytePointerVal); param.value.voidConstPointerVal);
break; break;
case ParamType::TGLuint: case ParamType::TGLuint:
WriteParamValueReplay<ParamType::TGLuint>(os, call, param.value.GLuintVal); WriteParamValueReplay<ParamType::TGLuint>(os, call, param.value.GLuintVal);
...@@ -232,39 +233,39 @@ void WriteParamCaptureReplay(std::ostream &os, const CallCapture &call, const Pa ...@@ -232,39 +233,39 @@ void WriteParamCaptureReplay(std::ostream &os, const CallCapture &call, const Pa
WriteParamValueReplay<ParamType::TGLuint64>(os, call, param.value.GLuint64Val); WriteParamValueReplay<ParamType::TGLuint64>(os, call, param.value.GLuint64Val);
break; break;
case ParamType::TGLuint64ConstPointer: case ParamType::TGLuint64ConstPointer:
WriteParamValueReplay<ParamType::TGLuint64ConstPointer>( WriteParamValueReplay<ParamType::TvoidConstPointer>(os, call,
os, call, param.value.GLuint64ConstPointerVal); param.value.voidConstPointerVal);
break; break;
case ParamType::TGLuint64Pointer: case ParamType::TGLuint64Pointer:
WriteParamValueReplay<ParamType::TGLuint64Pointer>(os, call, WriteParamValueReplay<ParamType::TvoidConstPointer>(os, call,
param.value.GLuint64PointerVal); param.value.voidConstPointerVal);
break; break;
case ParamType::TGLuintConstPointer: case ParamType::TGLuintConstPointer:
WriteParamValueReplay<ParamType::TGLuintConstPointer>( WriteParamValueReplay<ParamType::TvoidConstPointer>(os, call,
os, call, param.value.GLuintConstPointerVal); param.value.voidConstPointerVal);
break; break;
case ParamType::TGLuintPointer: case ParamType::TGLuintPointer:
WriteParamValueReplay<ParamType::TGLuintPointer>(os, call, WriteParamValueReplay<ParamType::TvoidConstPointer>(os, call,
param.value.GLuintPointerVal); param.value.voidConstPointerVal);
break; break;
case ParamType::TGLushort: case ParamType::TGLushort:
WriteParamValueReplay<ParamType::TGLushort>(os, call, param.value.GLushortVal); WriteParamValueReplay<ParamType::TGLushort>(os, call, param.value.GLushortVal);
break; break;
case ParamType::TGLushortConstPointer: case ParamType::TGLushortConstPointer:
WriteParamValueReplay<ParamType::TGLushortConstPointer>( WriteParamValueReplay<ParamType::TvoidConstPointer>(os, call,
os, call, param.value.GLushortConstPointerVal); param.value.voidConstPointerVal);
break; break;
case ParamType::TGLushortPointer: case ParamType::TGLushortPointer:
WriteParamValueReplay<ParamType::TGLushortPointer>(os, call, WriteParamValueReplay<ParamType::TvoidConstPointer>(os, call,
param.value.GLushortPointerVal); param.value.voidConstPointerVal);
break; break;
case ParamType::TGLvoidConstPointer: case ParamType::TGLvoidConstPointer:
WriteParamValueReplay<ParamType::TGLvoidConstPointer>( WriteParamValueReplay<ParamType::TvoidConstPointer>(os, call,
os, call, param.value.GLvoidConstPointerVal); param.value.voidConstPointerVal);
break; break;
case ParamType::TGLvoidConstPointerPointer: case ParamType::TGLvoidConstPointerPointer:
WriteParamValueReplay<ParamType::TGLvoidConstPointerPointer>( WriteParamValueReplay<ParamType::TvoidConstPointer>(os, call,
os, call, param.value.GLvoidConstPointerPointerVal); param.value.voidConstPointerVal);
break; break;
case ParamType::TGraphicsResetStatus: case ParamType::TGraphicsResetStatus:
WriteParamValueReplay<ParamType::TGraphicsResetStatus>( WriteParamValueReplay<ParamType::TGraphicsResetStatus>(
...@@ -293,12 +294,12 @@ void WriteParamCaptureReplay(std::ostream &os, const CallCapture &call, const Pa ...@@ -293,12 +294,12 @@ void WriteParamCaptureReplay(std::ostream &os, const CallCapture &call, const Pa
param.value.MemoryObjectIDVal); param.value.MemoryObjectIDVal);
break; break;
case ParamType::TMemoryObjectIDConstPointer: case ParamType::TMemoryObjectIDConstPointer:
WriteParamValueReplay<ParamType::TMemoryObjectIDConstPointer>( WriteParamValueReplay<ParamType::TvoidConstPointer>(os, call,
os, call, param.value.MemoryObjectIDConstPointerVal); param.value.voidConstPointerVal);
break; break;
case ParamType::TMemoryObjectIDPointer: case ParamType::TMemoryObjectIDPointer:
WriteParamValueReplay<ParamType::TMemoryObjectIDPointer>( WriteParamValueReplay<ParamType::TvoidConstPointer>(os, call,
os, call, param.value.MemoryObjectIDPointerVal); param.value.voidConstPointerVal);
break; break;
case ParamType::TPointParameter: case ParamType::TPointParameter:
WriteParamValueReplay<ParamType::TPointParameter>(os, call, WriteParamValueReplay<ParamType::TPointParameter>(os, call,
...@@ -313,12 +314,12 @@ void WriteParamCaptureReplay(std::ostream &os, const CallCapture &call, const Pa ...@@ -313,12 +314,12 @@ void WriteParamCaptureReplay(std::ostream &os, const CallCapture &call, const Pa
param.value.ProgramPipelineIDVal); param.value.ProgramPipelineIDVal);
break; break;
case ParamType::TProgramPipelineIDConstPointer: case ParamType::TProgramPipelineIDConstPointer:
WriteParamValueReplay<ParamType::TProgramPipelineIDConstPointer>( WriteParamValueReplay<ParamType::TvoidConstPointer>(os, call,
os, call, param.value.ProgramPipelineIDConstPointerVal); param.value.voidConstPointerVal);
break; break;
case ParamType::TProgramPipelineIDPointer: case ParamType::TProgramPipelineIDPointer:
WriteParamValueReplay<ParamType::TProgramPipelineIDPointer>( WriteParamValueReplay<ParamType::TvoidConstPointer>(os, call,
os, call, param.value.ProgramPipelineIDPointerVal); param.value.voidConstPointerVal);
break; break;
case ParamType::TProvokingVertexConvention: case ParamType::TProvokingVertexConvention:
WriteParamValueReplay<ParamType::TProvokingVertexConvention>( WriteParamValueReplay<ParamType::TProvokingVertexConvention>(
...@@ -328,12 +329,12 @@ void WriteParamCaptureReplay(std::ostream &os, const CallCapture &call, const Pa ...@@ -328,12 +329,12 @@ void WriteParamCaptureReplay(std::ostream &os, const CallCapture &call, const Pa
WriteParamValueReplay<ParamType::TQueryID>(os, call, param.value.QueryIDVal); WriteParamValueReplay<ParamType::TQueryID>(os, call, param.value.QueryIDVal);
break; break;
case ParamType::TQueryIDConstPointer: case ParamType::TQueryIDConstPointer:
WriteParamValueReplay<ParamType::TQueryIDConstPointer>( WriteParamValueReplay<ParamType::TvoidConstPointer>(os, call,
os, call, param.value.QueryIDConstPointerVal); param.value.voidConstPointerVal);
break; break;
case ParamType::TQueryIDPointer: case ParamType::TQueryIDPointer:
WriteParamValueReplay<ParamType::TQueryIDPointer>(os, call, WriteParamValueReplay<ParamType::TvoidConstPointer>(os, call,
param.value.QueryIDPointerVal); param.value.voidConstPointerVal);
break; break;
case ParamType::TQueryType: case ParamType::TQueryType:
WriteParamValueReplay<ParamType::TQueryType>(os, call, param.value.QueryTypeVal); WriteParamValueReplay<ParamType::TQueryType>(os, call, param.value.QueryTypeVal);
...@@ -343,46 +344,46 @@ void WriteParamCaptureReplay(std::ostream &os, const CallCapture &call, const Pa ...@@ -343,46 +344,46 @@ void WriteParamCaptureReplay(std::ostream &os, const CallCapture &call, const Pa
param.value.RenderbufferIDVal); param.value.RenderbufferIDVal);
break; break;
case ParamType::TRenderbufferIDConstPointer: case ParamType::TRenderbufferIDConstPointer:
WriteParamValueReplay<ParamType::TRenderbufferIDConstPointer>( WriteParamValueReplay<ParamType::TvoidConstPointer>(os, call,
os, call, param.value.RenderbufferIDConstPointerVal); param.value.voidConstPointerVal);
break; break;
case ParamType::TRenderbufferIDPointer: case ParamType::TRenderbufferIDPointer:
WriteParamValueReplay<ParamType::TRenderbufferIDPointer>( WriteParamValueReplay<ParamType::TvoidConstPointer>(os, call,
os, call, param.value.RenderbufferIDPointerVal); param.value.voidConstPointerVal);
break; break;
case ParamType::TSamplerID: case ParamType::TSamplerID:
WriteParamValueReplay<ParamType::TSamplerID>(os, call, param.value.SamplerIDVal); WriteParamValueReplay<ParamType::TSamplerID>(os, call, param.value.SamplerIDVal);
break; break;
case ParamType::TSamplerIDConstPointer: case ParamType::TSamplerIDConstPointer:
WriteParamValueReplay<ParamType::TSamplerIDConstPointer>( WriteParamValueReplay<ParamType::TvoidConstPointer>(os, call,
os, call, param.value.SamplerIDConstPointerVal); param.value.voidConstPointerVal);
break; break;
case ParamType::TSamplerIDPointer: case ParamType::TSamplerIDPointer:
WriteParamValueReplay<ParamType::TSamplerIDPointer>(os, call, WriteParamValueReplay<ParamType::TvoidConstPointer>(os, call,
param.value.SamplerIDPointerVal); param.value.voidConstPointerVal);
break; break;
case ParamType::TSemaphoreID: case ParamType::TSemaphoreID:
WriteParamValueReplay<ParamType::TSemaphoreID>(os, call, param.value.SemaphoreIDVal); WriteParamValueReplay<ParamType::TSemaphoreID>(os, call, param.value.SemaphoreIDVal);
break; break;
case ParamType::TSemaphoreIDConstPointer: case ParamType::TSemaphoreIDConstPointer:
WriteParamValueReplay<ParamType::TSemaphoreIDConstPointer>( WriteParamValueReplay<ParamType::TvoidConstPointer>(os, call,
os, call, param.value.SemaphoreIDConstPointerVal); param.value.voidConstPointerVal);
break; break;
case ParamType::TSemaphoreIDPointer: case ParamType::TSemaphoreIDPointer:
WriteParamValueReplay<ParamType::TSemaphoreIDPointer>( WriteParamValueReplay<ParamType::TvoidConstPointer>(os, call,
os, call, param.value.SemaphoreIDPointerVal); param.value.voidConstPointerVal);
break; break;
case ParamType::TShaderProgramID: case ParamType::TShaderProgramID:
WriteParamValueReplay<ParamType::TShaderProgramID>(os, call, WriteParamValueReplay<ParamType::TShaderProgramID>(os, call,
param.value.ShaderProgramIDVal); param.value.ShaderProgramIDVal);
break; break;
case ParamType::TShaderProgramIDConstPointer: case ParamType::TShaderProgramIDConstPointer:
WriteParamValueReplay<ParamType::TShaderProgramIDConstPointer>( WriteParamValueReplay<ParamType::TvoidConstPointer>(os, call,
os, call, param.value.ShaderProgramIDConstPointerVal); param.value.voidConstPointerVal);
break; break;
case ParamType::TShaderProgramIDPointer: case ParamType::TShaderProgramIDPointer:
WriteParamValueReplay<ParamType::TShaderProgramIDPointer>( WriteParamValueReplay<ParamType::TvoidConstPointer>(os, call,
os, call, param.value.ShaderProgramIDPointerVal); param.value.voidConstPointerVal);
break; break;
case ParamType::TShaderType: case ParamType::TShaderType:
WriteParamValueReplay<ParamType::TShaderType>(os, call, param.value.ShaderTypeVal); WriteParamValueReplay<ParamType::TShaderType>(os, call, param.value.ShaderTypeVal);
...@@ -402,12 +403,12 @@ void WriteParamCaptureReplay(std::ostream &os, const CallCapture &call, const Pa ...@@ -402,12 +403,12 @@ void WriteParamCaptureReplay(std::ostream &os, const CallCapture &call, const Pa
WriteParamValueReplay<ParamType::TTextureID>(os, call, param.value.TextureIDVal); WriteParamValueReplay<ParamType::TTextureID>(os, call, param.value.TextureIDVal);
break; break;
case ParamType::TTextureIDConstPointer: case ParamType::TTextureIDConstPointer:
WriteParamValueReplay<ParamType::TTextureIDConstPointer>( WriteParamValueReplay<ParamType::TvoidConstPointer>(os, call,
os, call, param.value.TextureIDConstPointerVal); param.value.voidConstPointerVal);
break; break;
case ParamType::TTextureIDPointer: case ParamType::TTextureIDPointer:
WriteParamValueReplay<ParamType::TTextureIDPointer>(os, call, WriteParamValueReplay<ParamType::TvoidConstPointer>(os, call,
param.value.TextureIDPointerVal); param.value.voidConstPointerVal);
break; break;
case ParamType::TTextureTarget: case ParamType::TTextureTarget:
WriteParamValueReplay<ParamType::TTextureTarget>(os, call, WriteParamValueReplay<ParamType::TTextureTarget>(os, call,
...@@ -421,12 +422,12 @@ void WriteParamCaptureReplay(std::ostream &os, const CallCapture &call, const Pa ...@@ -421,12 +422,12 @@ void WriteParamCaptureReplay(std::ostream &os, const CallCapture &call, const Pa
os, call, param.value.TransformFeedbackIDVal); os, call, param.value.TransformFeedbackIDVal);
break; break;
case ParamType::TTransformFeedbackIDConstPointer: case ParamType::TTransformFeedbackIDConstPointer:
WriteParamValueReplay<ParamType::TTransformFeedbackIDConstPointer>( WriteParamValueReplay<ParamType::TvoidConstPointer>(os, call,
os, call, param.value.TransformFeedbackIDConstPointerVal); param.value.voidConstPointerVal);
break; break;
case ParamType::TTransformFeedbackIDPointer: case ParamType::TTransformFeedbackIDPointer:
WriteParamValueReplay<ParamType::TTransformFeedbackIDPointer>( WriteParamValueReplay<ParamType::TvoidConstPointer>(os, call,
os, call, param.value.TransformFeedbackIDPointerVal); param.value.voidConstPointerVal);
break; break;
case ParamType::TUniformLocation: case ParamType::TUniformLocation:
WriteParamValueReplay<ParamType::TUniformLocation>(os, call, WriteParamValueReplay<ParamType::TUniformLocation>(os, call,
...@@ -437,12 +438,12 @@ void WriteParamCaptureReplay(std::ostream &os, const CallCapture &call, const Pa ...@@ -437,12 +438,12 @@ void WriteParamCaptureReplay(std::ostream &os, const CallCapture &call, const Pa
param.value.VertexArrayIDVal); param.value.VertexArrayIDVal);
break; break;
case ParamType::TVertexArrayIDConstPointer: case ParamType::TVertexArrayIDConstPointer:
WriteParamValueReplay<ParamType::TVertexArrayIDConstPointer>( WriteParamValueReplay<ParamType::TvoidConstPointer>(os, call,
os, call, param.value.VertexArrayIDConstPointerVal); param.value.voidConstPointerVal);
break; break;
case ParamType::TVertexArrayIDPointer: case ParamType::TVertexArrayIDPointer:
WriteParamValueReplay<ParamType::TVertexArrayIDPointer>( WriteParamValueReplay<ParamType::TvoidConstPointer>(os, call,
os, call, param.value.VertexArrayIDPointerVal); param.value.voidConstPointerVal);
break; break;
case ParamType::TVertexAttribType: case ParamType::TVertexAttribType:
WriteParamValueReplay<ParamType::TVertexAttribType>(os, call, WriteParamValueReplay<ParamType::TVertexAttribType>(os, call,
...@@ -453,15 +454,16 @@ void WriteParamCaptureReplay(std::ostream &os, const CallCapture &call, const Pa ...@@ -453,15 +454,16 @@ void WriteParamCaptureReplay(std::ostream &os, const CallCapture &call, const Pa
param.value.voidConstPointerVal); param.value.voidConstPointerVal);
break; break;
case ParamType::TvoidConstPointerPointer: case ParamType::TvoidConstPointerPointer:
WriteParamValueReplay<ParamType::TvoidConstPointerPointer>( WriteParamValueReplay<ParamType::TvoidConstPointer>(os, call,
os, call, param.value.voidConstPointerPointerVal); param.value.voidConstPointerVal);
break; break;
case ParamType::TvoidPointer: case ParamType::TvoidPointer:
WriteParamValueReplay<ParamType::TvoidPointer>(os, call, param.value.voidPointerVal); WriteParamValueReplay<ParamType::TvoidConstPointer>(os, call,
param.value.voidConstPointerVal);
break; break;
case ParamType::TvoidPointerPointer: case ParamType::TvoidPointerPointer:
WriteParamValueReplay<ParamType::TvoidPointerPointer>( WriteParamValueReplay<ParamType::TvoidConstPointer>(os, call,
os, call, param.value.voidPointerPointerVal); param.value.voidConstPointerVal);
break; break;
default: default:
os << "unknown"; 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