Skip to content

A
angle
Commit f3dbf0a7 by Jiacheng Lu Committed by Commit Bot
Options

FrameCapture dump GLenum to enum instead of value

Add functionality to capture GLenum and GLbitfield parameters as enum names instead of values. Bug: angleproject:3611 Change-Id: I7ddc21093d44d1480b205563f30d89f82779b1f1 Reviewed-on: https://chromium-review.googlesource.com/c/angle/angle/+/1724460 Commit-Queue: Jamie Madill <jmadill@chromium.org> Reviewed-by: 's avatarJamie Madill <jmadill@chromium.org>
parent b8c0dc04
Showing with 1085 additions and 407 deletions
scripts/code_generation_hashes/GL_EGL_WGL_loader.json
......@@ -6,7 +6,7 @@
"scripts/generate_loader.py":
"48c60c668bec42a80378179aae2acc61",
"scripts/registry_xml.py":
"97cca309a0561f3bf54e0e2c1cf0708b",
"40cac0341003ce27d09003ada7f367b4",
"scripts/wgl.xml":
"aa96419c582af2f6673430e2847693f4",
"src/libEGL/egl_loader_autogen.cpp":
......
scripts/code_generation_hashes/GL_EGL_entry_points.json
......@@ -6,13 +6,13 @@
"scripts/entry_point_packed_gl_enums.json":
"e5282bdef690f0ec652fed0e0723d1e8",
"scripts/generate_entry_points.py":
"72873c3806e749bf593bea823918e520",
"c7ee7654f91562e2cb6ad9f336d08003",
"scripts/gl.xml":
"b470cb06b06cbbe7adb2c8129ec85708",
"scripts/gl_angle_ext.xml":
"bed6b56a38621721e689ebc19601a556",
"scripts/registry_xml.py":
"97cca309a0561f3bf54e0e2c1cf0708b",
"40cac0341003ce27d09003ada7f367b4",
"scripts/wgl.xml":
"aa96419c582af2f6673430e2847693f4",
"src/libANGLE/Context_gl_1_0_autogen.h":
......@@ -64,23 +64,23 @@
"src/libANGLE/Context_gles_ext_autogen.h":
"d924200ebeb9fd0fae9effbc8489d3e1",
"src/libANGLE/capture_gles_1_0_autogen.cpp":
"bc6dbb7355d76c9ffff0d424b5ca9036",
"f4e1335bebff584d2ac5198571b19972",
"src/libANGLE/capture_gles_1_0_autogen.h":
"06471d4526e8d0b824f5afc8bc8766fa",
"src/libANGLE/capture_gles_2_0_autogen.cpp":
"a7ccc51733f4c608ae79e30195ebe70f",
"9d1b9bd6f71e2c0228e428ea84ea999e",
"src/libANGLE/capture_gles_2_0_autogen.h":
"9876493671f3051054cb10524330c8b1",
"src/libANGLE/capture_gles_3_0_autogen.cpp":
"1af4126b8eac91fd7401caa9bf4e9a7c",
"d6319fca11942f61679ae1b64cfd499c",
"src/libANGLE/capture_gles_3_0_autogen.h":
"3b17c1843763678272281e1f2a59e254",
"src/libANGLE/capture_gles_3_1_autogen.cpp":
"405717bc0d7a9c815fd81e119e69d219",
"b7aee1b622dde5c9146fa9eaaf0e7331",
"src/libANGLE/capture_gles_3_1_autogen.h":
"7f3ff3ade9045bae39ed372e0350454c",
"src/libANGLE/capture_gles_ext_autogen.cpp":
"52f20a5a311c646510d31e6aa77b03cd",
"e574230ccde2276d4e2e77a11a89c7fd",
"src/libANGLE/capture_gles_ext_autogen.h":
"2f2cfa1ee077c3b535138547db57e1af",
"src/libANGLE/entry_points_enum_autogen.cpp":
......
scripts/code_generation_hashes/GLenum_value_to_string_map.json 0 → 100644
{
"scripts/gen_gl_enum_utils.py":
"b01e8fd8aaf03282f430d98cccc960e4",
"scripts/gl.xml":
"b470cb06b06cbbe7adb2c8129ec85708",
"scripts/gl_angle_ext.xml":
"bed6b56a38621721e689ebc19601a556",
"src/libANGLE/gl_enum_utils_autogen.cpp":
"e1b0d3b84de3e2259961c4af2a1e7853",
"src/libANGLE/gl_enum_utils_autogen.h":
"c04076709a7f310bc313d2eae0713f1e"
}
\ No newline at end of file
scripts/code_generation_hashes/proc_table.json
......@@ -10,7 +10,7 @@
"scripts/gl_angle_ext.xml":
"bed6b56a38621721e689ebc19601a556",
"scripts/registry_xml.py":
"97cca309a0561f3bf54e0e2c1cf0708b",
"40cac0341003ce27d09003ada7f367b4",
"scripts/wgl.xml":
"aa96419c582af2f6673430e2847693f4",
"src/libGL/proc_table_wgl_autogen.cpp":
......
scripts/gen_gl_enum_utils.py 0 → 100755
#!/usr/bin/python
#
# Copyright 2019 The ANGLE Project Authors. All rights reserved.
# Use of this source code is governed by a BSD-style license that can be
# found in the LICENSE file.
#
# gen_gl_enum_utils.py:
# Generates GLenum value to string mapping for ANGLE
# NOTE: don't run this script directly. Run scripts/run_code_generation.py.
import sys
import os
import re
from datetime import date
from collections import namedtuple
import registry_xml
template_gl_enums_header = """// GENERATED FILE - DO NOT EDIT.
// Generated by {script_name} using data from {data_source_name}.
//
// Copyright {year} The ANGLE Project Authors. All rights reserved.
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
//
// gl_enum_utils_autogen.h:
// mapping of GLenum value to string.
# ifndef LIBANGLE_GL_ENUM_UTILS_AUTOGEN_H_
# define LIBANGLE_GL_ENUM_UTILS_AUTOGEN_H_
#include <string>
namespace gl
{{
enum class GLenumGroup {{
{gl_enum_groups}
}};
const char *GLenumToString(GLenumGroup enumGroup, unsigned int value);
std::string GLbitfieldToString(GLenumGroup enumGroup, unsigned int value);
}}
# endif // LIBANGLE_GL_ENUM_UTILS_AUTOGEN_H_
"""
template_gl_enums_source = """// GENERATED FILE - DO NOT EDIT.
// Generated by {script_name} using data from {data_source_name}.
//
// Copyright {year} The ANGLE Project Authors. All rights reserved.
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
//
// gl_enum_utils_autogen.cpp:
// mapping of GLenum value to string.
#include "libANGLE/gl_enum_utils_autogen.h"
#include <sstream>
#include "common/debug.h"
#include "common/bitset_utils.h"
namespace gl
{{
const char *GLenumToString(GLenumGroup enumGroup, unsigned int value) {{
switch (enumGroup) {{
{gl_enums_value_to_string_table}
default:
UNREACHABLE();
return "EnumUnknown";
}}
}}
std::string GLbitfieldToString(GLenumGroup enumGroup, unsigned int value) {{
std::stringstream st;
const angle::BitSet<32> bitSet(value);
bool first = true;
for (const auto index : bitSet)
{{
if (!first)
{{
st << " | ";
}}
first = false;
unsigned int mask = 1u << index;
st << GLenumToString(enumGroup, mask);
}}
return st.str();
}}
}}
"""
template_enum_group_case = """case GLenumGroup::{group_name}: {{
switch (value) {{
{inner_group_cases}
default:
return "EnumUnknown";
}}
}}
"""
template_enum_value_to_string_case = """case {value}: return {name};"""
export_apis = ['gles2']
export_extensions = registry_xml.supported_extensions
trivial_gl_enums = {'GL_FALSE', 'GL_TRUE', 'GL_NO_ERROR', 'GL_TIMEOUT_IGNORED', 'GL_INVALID_INDEX'}
def dump_value_to_string_mapping(gl_enum_in_groups, exporting_enums):
exporting_groups = list()
for group_name, inner_mapping in gl_enum_in_groups.iteritems():
string_value_pairs = list(
filter(lambda x: x[0] in exporting_enums, inner_mapping.iteritems()))
if not string_value_pairs:
continue
# sort according values
string_value_pairs.sort(key=lambda x: (x[1], x[0]))
# remove all duplicate values from the pairs list
# some value may have more than one GLenum mapped to them, such as:
# GL_DRAW_FRAMEBUFFER_BINDING and GL_FRAMEBUFFER_BINDING
# GL_BLEND_EQUATION_RGB and GL_BLEND_EQUATION
# it is safe to output either one of them, for simplity here just
# choose the shorter one which comes first in the sorted list
exporting_string_value_pairs = list()
for index, pair in enumerate(string_value_pairs):
if index == 0 or pair[1] != string_value_pairs[index - 1][1]:
exporting_string_value_pairs.append(pair)
inner_code_block = "\n".join([
template_enum_value_to_string_case.format(
value=hex(value),
name='"%s"' % name,
) for name, value in exporting_string_value_pairs
])
exporting_groups.append((group_name, inner_code_block))
return "\n".join([
template_enum_group_case.format(
group_name=group_name,
inner_group_cases=inner_code_block,
) for group_name, inner_code_block in sorted(exporting_groups, key=lambda x: x[0])
])
def main(header_output_path, source_output_path):
xml = registry_xml.RegistryXML('gl.xml', 'gl_angle_ext.xml')
# build a map from GLenum name to its value
all_gl_enums = dict()
for enums_node in xml.root.findall('enums'):
for enum in enums_node.findall('enum'):
name = enum.attrib['name']
value = int(enum.attrib['value'], base=16)
all_gl_enums[name] = value
# Parse groups of GLenums to build a {group, name} -> value mapping.
gl_enum_in_groups = dict()
enums_has_group = set()
for enums_group_node in xml.root.findall('groups/group'):
group_name = enums_group_node.attrib['name']
if group_name not in gl_enum_in_groups:
gl_enum_in_groups[group_name] = dict()
for enum_node in enums_group_node.findall('enum'):
enum_name = enum_node.attrib['name']
enums_has_group.add(enum_name)
gl_enum_in_groups[group_name][enum_name] = all_gl_enums[enum_name]
# Find relevant GLenums according to enabled APIs and extensions.
exporting_enums = set()
for api in export_apis:
xpath = ".//feature[@api='%s']//require//enum" % api
for enum_tag in xml.root.findall(xpath):
enum_name = enum_tag.attrib['name']
exporting_enums.add(enum_name)
for extension in export_extensions:
xpath = ".//extensions//extension[@name='%s']//require//enum" % extension
for enum_tag in xml.root.findall(xpath):
enum_name = enum_tag.attrib['name']
exporting_enums.add(enum_name)
for enum in trivial_gl_enums:
if enum in exporting_enums:
exporting_enums.remove(enum)
# For enums that do not have a group, add them to a default group
default_group_name = registry_xml.default_enum_group_name
gl_enum_in_groups[default_group_name] = dict()
default_group = gl_enum_in_groups[default_group_name]
for enum_name in exporting_enums:
if enum_name not in enums_has_group:
default_group[enum_name] = all_gl_enums[enum_name]
# Write GLenum groups into the header file.
header_content = template_gl_enums_header.format(
script_name=os.path.basename(sys.argv[0]),
data_source_name="gl.xml and gl_angle_ext.xml",
year=date.today().year,
gl_enum_groups=',\n'.join(sorted(gl_enum_in_groups.iterkeys())))
with open(header_output_path, 'w') as f:
f.write(header_content)
# Write mapping to source file
gl_enums_value_to_string_table = dump_value_to_string_mapping(gl_enum_in_groups,
exporting_enums)
source_content = template_gl_enums_source.format(
script_name=os.path.basename(sys.argv[0]),
data_source_name="gl.xml and gl_angle_ext.xml",
year=date.today().year,
gl_enums_value_to_string_table=gl_enums_value_to_string_table,
)
source_output_path = registry_xml.script_relative(source_output_path)
with open(source_output_path, 'w') as f:
f.write(source_content)
return 0
if __name__ == '__main__':
inputs = [
'gl.xml',
'gl_angle_ext.xml',
]
gl_enum_utils_autogen_base_path = '../src/libANGLE/gl_enum_utils_autogen'
outputs = [
gl_enum_utils_autogen_base_path + '.h',
gl_enum_utils_autogen_base_path + '.cpp',
]
if len(sys.argv) > 1:
if sys.argv[1] == 'inputs':
print ','.join(inputs)
elif sys.argv[1] == 'outputs':
print ','.join(outputs)
else:
sys.exit(
main(
registry_xml.script_relative(outputs[0]),
registry_xml.script_relative(outputs[1])))
scripts/generate_entry_points.py
......@@ -302,6 +302,7 @@ template_capture_source = """// GENERATED FILE - DO NOT EDIT.
#include "libANGLE/Context.h"
#include "libANGLE/FrameCapture.h"
#include "libANGLE/gl_enum_utils_autogen.h"
#include "libANGLE/validation{annotation_no_dash}.h"
using namespace angle;
......@@ -340,6 +341,8 @@ CallCapture Capture{short_name}({params_with_type})
template_parameter_capture_value = """paramBuffer.addValueParam("{name}", ParamType::T{type}, {name});"""
template_parameter_capture_gl_enum = """paramBuffer.addEnumParam("{name}", GLenumGroup::{group}, ParamType::T{type}, {name});"""
template_parameter_capture_pointer = """
ParamCapture {name}Param("{name}", ParamType::T{type});
InitParamValue(ParamType::T{type}, {name}, &{name}Param.value);
......@@ -676,6 +679,19 @@ def strip_suffix(name):
return name
def find_gl_enum_group_in_command(command_node, param_name):
group_name = None
for param_node in command_node.findall('./param'):
if param_node.find('./name').text == param_name:
group_name = param_node.attrib.get('group', None)
break
if group_name is None or group_name in registry_xml.unsupported_enum_group_names:
group_name = registry_xml.default_enum_group_name
return group_name
def format_entry_point_def(cmd_name, proto, params, is_explicit_context):
packed_gl_enums = cmd_packed_gl_enums.get(cmd_name, {})
internal_params = [just_the_name_packed(param, packed_gl_enums) for param in params]
......@@ -754,7 +770,8 @@ def get_capture_param_type_name(param_type):
return param_type
def format_capture_method(cmd_name, proto, params, all_param_types, capture_pointer_funcs):
def format_capture_method(command, cmd_name, proto, params, all_param_types,
capture_pointer_funcs):
packed_gl_enums = cmd_packed_gl_enums.get(cmd_name, {})
......@@ -782,6 +799,10 @@ def format_capture_method(cmd_name, proto, params, all_param_types, capture_poin
capture_pointer_func = template_parameter_capture_pointer_func.format(
name=capture_name, params=params_with_type + ", angle::ParamCapture *paramCapture")
capture_pointer_funcs += [capture_pointer_func]
elif param_type in ('GLenum', 'GLbitfield'):
gl_enum_group = find_gl_enum_group_in_command(command, param_name)
capture = template_parameter_capture_gl_enum.format(
name=param_name, type=param_type, group=gl_enum_group)
else:
capture = template_parameter_capture_value.format(name=param_name, type=param_type)
......@@ -893,7 +914,7 @@ def get_entry_points(all_commands, commands, is_explicit_context, is_wgl, all_pa
validation_protos.append(format_validation_proto(cmd_name, param_text))
capture_protos.append(format_capture_proto(cmd_name, proto_text, param_text))
capture_methods.append(
format_capture_method(cmd_name, proto_text, param_text, all_param_types,
format_capture_method(command, cmd_name, proto_text, param_text, all_param_types,
capture_pointer_funcs))
return decls, defs, export_defs, validation_protos, capture_protos, capture_methods, capture_pointer_funcs
......
scripts/registry_xml.py
......@@ -10,7 +10,8 @@
# List of supported extensions. Add to this list to enable new extensions
# available in gl.xml.
import sys, os
import sys
import os
import xml.etree.ElementTree as etree
xml_inputs = [
......@@ -124,6 +125,22 @@ strip_suffixes = ["ANGLE", "EXT", "KHR", "OES", "CHROMIUM"]
# Toggle generation here.
support_EGL_ANGLE_explicit_context = True
# For ungrouped GLenum types
default_enum_group_name = "DefaultGroup"
# Group names that appear in command/param, but not present in groups/group
unsupported_enum_group_names = {
'GetMultisamplePNameNV',
'BufferPNameARB',
'BufferPointerNameARB',
'VertexAttribPointerPropertyARB',
'VertexAttribPropertyARB',
'FenceParameterNameNV',
'FenceConditionNV',
'BufferPointerNameARB',
'MatrixIndexPointerTypeARB',
}
def script_relative(path):
return os.path.join(os.path.dirname(sys.argv[0]), path)
......
scripts/run_code_generation.py
......@@ -81,6 +81,8 @@ generators = {
'scripts/generate_loader.py',
'GL/EGL entry points':
'scripts/generate_entry_points.py',
'GLenum value to string map':
'scripts/gen_gl_enum_utils.py',
'GL format map':
'src/libANGLE/gen_format_map.py',
'uniform type':
......
src/libANGLE/FrameCapture.cpp
......@@ -13,6 +13,7 @@
#include "libANGLE/Context.h"
#include "libANGLE/VertexArray.h"
#include "libANGLE/gl_enum_utils_autogen.h"
namespace angle
{
......@@ -60,13 +61,14 @@ void WriteInlineData(const std::vector<uint8_t> &vec, std::ostream &out)
constexpr size_t kInlineDataThreshold = 128;
} // anonymous namespace
ParamCapture::ParamCapture() : type(ParamType::TGLenum) {}
ParamCapture::ParamCapture() : type(ParamType::TGLenum), enumGroup(gl::GLenumGroup::DefaultGroup) {}
ParamCapture::ParamCapture(const char *nameIn, ParamType typeIn) : name(nameIn), type(typeIn) {}
ParamCapture::~ParamCapture() = default;
ParamCapture::ParamCapture(ParamCapture &&other) : type(ParamType::TGLenum)
ParamCapture::ParamCapture(ParamCapture &&other)
: type(ParamType::TGLenum), enumGroup(gl::GLenumGroup::DefaultGroup)
{
*this = std::move(other);
}
......@@ -76,6 +78,7 @@ ParamCapture &ParamCapture::operator=(ParamCapture &&other)
std::swap(name, other.name);
std::swap(type, other.type);
std::swap(value, other.value);
std::swap(enumGroup, other.enumGroup);
std::swap(data, other.data);
std::swap(arrayClientPointerIndex, other.arrayClientPointerIndex);
std::swap(readBufferSizeBytes, other.readBufferSizeBytes);
......@@ -427,7 +430,18 @@ void FrameCapture::writeCallReplay(const CallCapture &call,
}
else if (param.data.empty())
{
out << param;
if (param.type == ParamType::TGLenum)
{
out << GLenumToString(param.enumGroup, param.value.GLenumVal);
}
else if (param.type == ParamType::TGLbitfield)
{
out << GLbitfieldToString(param.enumGroup, param.value.GLbitfieldVal);
}
else
{
out << param;
}
}
else
{
......
src/libANGLE/FrameCapture.h
......@@ -15,6 +15,7 @@
#include "libANGLE/angletypes.h"
#include "libANGLE/entry_points_utils.h"
#include "libANGLE/frame_capture_utils_autogen.h"
#include "libANGLE/gl_enum_utils_autogen.h"
#include <tuple>
......@@ -32,6 +33,7 @@ struct ParamCapture : angle::NonCopyable
std::string name;
ParamType type;
ParamValue value;
gl::GLenumGroup enumGroup; // only used for param type GLenum, GLboolean and GLbitfield
std::vector<std::vector<uint8_t>> data;
int arrayClientPointerIndex = -1;
size_t readBufferSizeBytes = 0;
......@@ -48,6 +50,11 @@ class ParamBuffer final : angle::NonCopyable
template <typename T>
void addValueParam(const char *paramName, ParamType paramType, T paramValue);
template <typename T>
void addEnumParam(const char *paramName,
gl::GLenumGroup enumGroup,
ParamType paramType,
T paramValue);
ParamCapture &getParam(const char *paramName, ParamType paramType, int index);
......@@ -139,6 +146,18 @@ void ParamBuffer::addValueParam(const char *paramName, ParamType paramType, T pa
mParamCaptures.emplace_back(std::move(capture));
}
template <typename T>
void ParamBuffer::addEnumParam(const char *paramName,
gl::GLenumGroup enumGroup,
ParamType paramType,
T paramValue)
{
ParamCapture capture(paramName, paramType);
InitParamValue(paramType, paramValue, &capture.value);
capture.enumGroup = enumGroup;
mParamCaptures.emplace_back(std::move(capture));
}
std::ostream &operator<<(std::ostream &os, const ParamCapture &capture);
// Pointer capture helpers.
......
src/libANGLE/capture_gles_1_0_autogen.cpp
......@@ -12,6 +12,7 @@
#include "libANGLE/Context.h"
#include "libANGLE/FrameCapture.h"
#include "libANGLE/gl_enum_utils_autogen.h"
#include "libANGLE/validationES1.h"
using namespace angle;
......@@ -75,7 +76,7 @@ CallCapture CaptureClientActiveTexture(const Context *context, bool isCallValid,
{
ParamBuffer paramBuffer;
paramBuffer.addValueParam("texture", ParamType::TGLenum, texture);
paramBuffer.addEnumParam("texture", GLenumGroup::TextureUnit, ParamType::TGLenum, texture);
return CallCapture(gl::EntryPoint::ClientActiveTexture, std::move(paramBuffer));
}
......@@ -87,7 +88,7 @@ CallCapture CaptureClipPlanef(const Context *context,
{
ParamBuffer paramBuffer;
paramBuffer.addValueParam("p", ParamType::TGLenum, p);
paramBuffer.addEnumParam("p", GLenumGroup::ClipPlaneName, ParamType::TGLenum, p);
ParamCapture eqnParam("eqn", ParamType::TGLfloatConstPointer);
InitParamValue(ParamType::TGLfloatConstPointer, eqn, &eqnParam.value);
......@@ -104,7 +105,7 @@ CallCapture CaptureClipPlanex(const Context *context,
{
ParamBuffer paramBuffer;
paramBuffer.addValueParam("plane", ParamType::TGLenum, plane);
paramBuffer.addEnumParam("plane", GLenumGroup::ClipPlaneName, ParamType::TGLenum, plane);
ParamCapture equationParam("equation", ParamType::TGLfixedConstPointer);
InitParamValue(ParamType::TGLfixedConstPointer, equation, &equationParam.value);
......@@ -223,7 +224,7 @@ CallCapture CaptureFogf(const Context *context, bool isCallValid, GLenum pname,
{
ParamBuffer paramBuffer;
paramBuffer.addValueParam("pname", ParamType::TGLenum, pname);
paramBuffer.addEnumParam("pname", GLenumGroup::FogParameter, ParamType::TGLenum, pname);
paramBuffer.addValueParam("param", ParamType::TGLfloat, param);
return CallCapture(gl::EntryPoint::Fogf, std::move(paramBuffer));
......@@ -236,7 +237,7 @@ CallCapture CaptureFogfv(const Context *context,
{
ParamBuffer paramBuffer;
paramBuffer.addValueParam("pname", ParamType::TGLenum, pname);
paramBuffer.addEnumParam("pname", GLenumGroup::FogParameter, ParamType::TGLenum, pname);
ParamCapture paramsParam("params", ParamType::TGLfloatConstPointer);
InitParamValue(ParamType::TGLfloatConstPointer, params, &paramsParam.value);
......@@ -250,7 +251,7 @@ CallCapture CaptureFogx(const Context *context, bool isCallValid, GLenum pname,
{
ParamBuffer paramBuffer;
paramBuffer.addValueParam("pname", ParamType::TGLenum, pname);
paramBuffer.addEnumParam("pname", GLenumGroup::FogPName, ParamType::TGLenum, pname);
paramBuffer.addValueParam("param", ParamType::TGLfixed, param);
return CallCapture(gl::EntryPoint::Fogx, std::move(paramBuffer));
......@@ -263,7 +264,7 @@ CallCapture CaptureFogxv(const Context *context,
{
ParamBuffer paramBuffer;
paramBuffer.addValueParam("pname", ParamType::TGLenum, pname);
paramBuffer.addEnumParam("pname", GLenumGroup::FogPName, ParamType::TGLenum, pname);
ParamCapture paramParam("param", ParamType::TGLfixedConstPointer);
InitParamValue(ParamType::TGLfixedConstPointer, param, &paramParam.value);
......@@ -322,7 +323,7 @@ CallCapture CaptureGetClipPlanef(const Context *context,
{
ParamBuffer paramBuffer;
paramBuffer.addValueParam("plane", ParamType::TGLenum, plane);
paramBuffer.addEnumParam("plane", GLenumGroup::ClipPlaneName, ParamType::TGLenum, plane);
ParamCapture equationParam("equation", ParamType::TGLfloatPointer);
InitParamValue(ParamType::TGLfloatPointer, equation, &equationParam.value);
......@@ -339,7 +340,7 @@ CallCapture CaptureGetClipPlanex(const Context *context,
{
ParamBuffer paramBuffer;
paramBuffer.addValueParam("plane", ParamType::TGLenum, plane);
paramBuffer.addEnumParam("plane", GLenumGroup::ClipPlaneName, ParamType::TGLenum, plane);
ParamCapture equationParam("equation", ParamType::TGLfixedPointer);
InitParamValue(ParamType::TGLfixedPointer, equation, &equationParam.value);
......@@ -356,7 +357,7 @@ CallCapture CaptureGetFixedv(const Context *context,
{
ParamBuffer paramBuffer;
paramBuffer.addValueParam("pname", ParamType::TGLenum, pname);
paramBuffer.addEnumParam("pname", GLenumGroup::GetPName, ParamType::TGLenum, pname);
ParamCapture paramsParam("params", ParamType::TGLfixedPointer);
InitParamValue(ParamType::TGLfixedPointer, params, &paramsParam.value);
......@@ -374,7 +375,7 @@ CallCapture CaptureGetLightfv(const Context *context,
{
ParamBuffer paramBuffer;
paramBuffer.addValueParam("light", ParamType::TGLenum, light);
paramBuffer.addEnumParam("light", GLenumGroup::LightName, ParamType::TGLenum, light);
paramBuffer.addValueParam("pnamePacked", ParamType::TLightParameter, pnamePacked);
ParamCapture paramsParam("params", ParamType::TGLfloatPointer);
......@@ -393,7 +394,7 @@ CallCapture CaptureGetLightxv(const Context *context,
{
ParamBuffer paramBuffer;
paramBuffer.addValueParam("light", ParamType::TGLenum, light);
paramBuffer.addEnumParam("light", GLenumGroup::LightName, ParamType::TGLenum, light);
paramBuffer.addValueParam("pnamePacked", ParamType::TLightParameter, pnamePacked);
ParamCapture paramsParam("params", ParamType::TGLfixedPointer);
......@@ -412,7 +413,7 @@ CallCapture CaptureGetMaterialfv(const Context *context,
{
ParamBuffer paramBuffer;
paramBuffer.addValueParam("face", ParamType::TGLenum, face);
paramBuffer.addEnumParam("face", GLenumGroup::MaterialFace, ParamType::TGLenum, face);
paramBuffer.addValueParam("pnamePacked", ParamType::TMaterialParameter, pnamePacked);
ParamCapture paramsParam("params", ParamType::TGLfloatPointer);
......@@ -431,7 +432,7 @@ CallCapture CaptureGetMaterialxv(const Context *context,
{
ParamBuffer paramBuffer;
paramBuffer.addValueParam("face", ParamType::TGLenum, face);
paramBuffer.addEnumParam("face", GLenumGroup::MaterialFace, ParamType::TGLenum, face);
paramBuffer.addValueParam("pnamePacked", ParamType::TMaterialParameter, pnamePacked);
ParamCapture paramsParam("params", ParamType::TGLfixedPointer);
......@@ -449,7 +450,7 @@ CallCapture CaptureGetPointerv(const Context *context,
{
ParamBuffer paramBuffer;
paramBuffer.addValueParam("pname", ParamType::TGLenum, pname);
paramBuffer.addEnumParam("pname", GLenumGroup::GetPointervPName, ParamType::TGLenum, pname);
ParamCapture paramsParam("params", ParamType::TvoidPointerPointer);
InitParamValue(ParamType::TvoidPointerPointer, params, &paramsParam.value);
......@@ -528,7 +529,7 @@ CallCapture CaptureGetTexParameterxv(const Context *context,
ParamBuffer paramBuffer;
paramBuffer.addValueParam("targetPacked", ParamType::TTextureType, targetPacked);
paramBuffer.addValueParam("pname", ParamType::TGLenum, pname);
paramBuffer.addEnumParam("pname", GLenumGroup::GetTextureParameter, ParamType::TGLenum, pname);
ParamCapture paramsParam("params", ParamType::TGLfixedPointer);
InitParamValue(ParamType::TGLfixedPointer, params, &paramsParam.value);
......@@ -546,7 +547,7 @@ CallCapture CaptureLightModelf(const Context *context,
{
ParamBuffer paramBuffer;
paramBuffer.addValueParam("pname", ParamType::TGLenum, pname);
paramBuffer.addEnumParam("pname", GLenumGroup::LightModelParameter, ParamType::TGLenum, pname);
paramBuffer.addValueParam("param", ParamType::TGLfloat, param);
return CallCapture(gl::EntryPoint::LightModelf, std::move(paramBuffer));
......@@ -559,7 +560,7 @@ CallCapture CaptureLightModelfv(const Context *context,
{
ParamBuffer paramBuffer;
paramBuffer.addValueParam("pname", ParamType::TGLenum, pname);
paramBuffer.addEnumParam("pname", GLenumGroup::LightModelParameter, ParamType::TGLenum, pname);
ParamCapture paramsParam("params", ParamType::TGLfloatConstPointer);
InitParamValue(ParamType::TGLfloatConstPointer, params, &paramsParam.value);
......@@ -576,7 +577,7 @@ CallCapture CaptureLightModelx(const Context *context,
{
ParamBuffer paramBuffer;
paramBuffer.addValueParam("pname", ParamType::TGLenum, pname);
paramBuffer.addEnumParam("pname", GLenumGroup::LightModelParameter, ParamType::TGLenum, pname);
paramBuffer.addValueParam("param", ParamType::TGLfixed, param);
return CallCapture(gl::EntryPoint::LightModelx, std::move(paramBuffer));
......@@ -589,7 +590,7 @@ CallCapture CaptureLightModelxv(const Context *context,
{
ParamBuffer paramBuffer;
paramBuffer.addValueParam("pname", ParamType::TGLenum, pname);
paramBuffer.addEnumParam("pname", GLenumGroup::LightModelParameter, ParamType::TGLenum, pname);
ParamCapture paramParam("param", ParamType::TGLfixedConstPointer);
InitParamValue(ParamType::TGLfixedConstPointer, param, &paramParam.value);
......@@ -607,7 +608,7 @@ CallCapture CaptureLightf(const Context *context,
{
ParamBuffer paramBuffer;
paramBuffer.addValueParam("light", ParamType::TGLenum, light);
paramBuffer.addEnumParam("light", GLenumGroup::LightName, ParamType::TGLenum, light);
paramBuffer.addValueParam("pnamePacked", ParamType::TLightParameter, pnamePacked);
paramBuffer.addValueParam("param", ParamType::TGLfloat, param);
......@@ -622,7 +623,7 @@ CallCapture CaptureLightfv(const Context *context,
{
ParamBuffer paramBuffer;
paramBuffer.addValueParam("light", ParamType::TGLenum, light);
paramBuffer.addEnumParam("light", GLenumGroup::LightName, ParamType::TGLenum, light);
paramBuffer.addValueParam("pnamePacked", ParamType::TLightParameter, pnamePacked);
ParamCapture paramsParam("params", ParamType::TGLfloatConstPointer);
......@@ -641,7 +642,7 @@ CallCapture CaptureLightx(const Context *context,
{
ParamBuffer paramBuffer;
paramBuffer.addValueParam("light", ParamType::TGLenum, light);
paramBuffer.addEnumParam("light", GLenumGroup::LightName, ParamType::TGLenum, light);
paramBuffer.addValueParam("pnamePacked", ParamType::TLightParameter, pnamePacked);
paramBuffer.addValueParam("param", ParamType::TGLfixed, param);
......@@ -656,7 +657,7 @@ CallCapture CaptureLightxv(const Context *context,
{
ParamBuffer paramBuffer;
paramBuffer.addValueParam("light", ParamType::TGLenum, light);
paramBuffer.addEnumParam("light", GLenumGroup::LightName, ParamType::TGLenum, light);
paramBuffer.addValueParam("pnamePacked", ParamType::TLightParameter, pnamePacked);
ParamCapture paramsParam("params", ParamType::TGLfixedConstPointer);
......@@ -724,7 +725,7 @@ CallCapture CaptureMaterialf(const Context *context,
{
ParamBuffer paramBuffer;
paramBuffer.addValueParam("face", ParamType::TGLenum, face);
paramBuffer.addEnumParam("face", GLenumGroup::MaterialFace, ParamType::TGLenum, face);
paramBuffer.addValueParam("pnamePacked", ParamType::TMaterialParameter, pnamePacked);
paramBuffer.addValueParam("param", ParamType::TGLfloat, param);
......@@ -739,7 +740,7 @@ CallCapture CaptureMaterialfv(const Context *context,
{
ParamBuffer paramBuffer;
paramBuffer.addValueParam("face", ParamType::TGLenum, face);
paramBuffer.addEnumParam("face", GLenumGroup::MaterialFace, ParamType::TGLenum, face);
paramBuffer.addValueParam("pnamePacked", ParamType::TMaterialParameter, pnamePacked);
ParamCapture paramsParam("params", ParamType::TGLfloatConstPointer);
......@@ -758,7 +759,7 @@ CallCapture CaptureMaterialx(const Context *context,
{
ParamBuffer paramBuffer;
paramBuffer.addValueParam("face", ParamType::TGLenum, face);
paramBuffer.addEnumParam("face", GLenumGroup::MaterialFace, ParamType::TGLenum, face);
paramBuffer.addValueParam("pnamePacked", ParamType::TMaterialParameter, pnamePacked);
paramBuffer.addValueParam("param", ParamType::TGLfixed, param);
......@@ -773,7 +774,7 @@ CallCapture CaptureMaterialxv(const Context *context,
{
ParamBuffer paramBuffer;
paramBuffer.addValueParam("face", ParamType::TGLenum, face);
paramBuffer.addEnumParam("face", GLenumGroup::MaterialFace, ParamType::TGLenum, face);
paramBuffer.addValueParam("pnamePacked", ParamType::TMaterialParameter, pnamePacked);
ParamCapture paramParam("param", ParamType::TGLfixedConstPointer);
......@@ -827,7 +828,7 @@ CallCapture CaptureMultiTexCoord4f(const Context *context,
{
ParamBuffer paramBuffer;
paramBuffer.addValueParam("target", ParamType::TGLenum, target);
paramBuffer.addEnumParam("target", GLenumGroup::TextureUnit, ParamType::TGLenum, target);
paramBuffer.addValueParam("s", ParamType::TGLfloat, s);
paramBuffer.addValueParam("t", ParamType::TGLfloat, t);
paramBuffer.addValueParam("r", ParamType::TGLfloat, r);
......@@ -846,7 +847,7 @@ CallCapture CaptureMultiTexCoord4x(const Context *context,
{
ParamBuffer paramBuffer;
paramBuffer.addValueParam("texture", ParamType::TGLenum, texture);
paramBuffer.addEnumParam("texture", GLenumGroup::TextureUnit, ParamType::TGLenum, texture);
paramBuffer.addValueParam("s", ParamType::TGLfixed, s);
paramBuffer.addValueParam("t", ParamType::TGLfixed, t);
paramBuffer.addValueParam("r", ParamType::TGLfixed, r);
......@@ -1262,7 +1263,7 @@ CallCapture CaptureTexParameterx(const Context *context,
ParamBuffer paramBuffer;
paramBuffer.addValueParam("targetPacked", ParamType::TTextureType, targetPacked);
paramBuffer.addValueParam("pname", ParamType::TGLenum, pname);
paramBuffer.addEnumParam("pname", GLenumGroup::GetTextureParameter, ParamType::TGLenum, pname);
paramBuffer.addValueParam("param", ParamType::TGLfixed, param);
return CallCapture(gl::EntryPoint::TexParameterx, std::move(paramBuffer));
......@@ -1277,7 +1278,7 @@ CallCapture CaptureTexParameterxv(const Context *context,
ParamBuffer paramBuffer;
paramBuffer.addValueParam("targetPacked", ParamType::TTextureType, targetPacked);
paramBuffer.addValueParam("pname", ParamType::TGLenum, pname);
paramBuffer.addEnumParam("pname", GLenumGroup::GetTextureParameter, ParamType::TGLenum, pname);
ParamCapture paramsParam("params", ParamType::TGLfixedConstPointer);
InitParamValue(ParamType::TGLfixedConstPointer, params, &paramsParam.value);
......
src/libANGLE/capture_gles_2_0_autogen.cpp
......@@ -12,6 +12,7 @@
#include "libANGLE/Context.h"
#include "libANGLE/FrameCapture.h"
#include "libANGLE/gl_enum_utils_autogen.h"
#include "libANGLE/validationES2.h"
using namespace angle;
......@@ -23,7 +24,7 @@ CallCapture CaptureActiveTexture(const Context *context, bool isCallValid, GLenu
{
ParamBuffer paramBuffer;
paramBuffer.addValueParam("texture", ParamType::TGLenum, texture);
paramBuffer.addEnumParam("texture", GLenumGroup::TextureUnit, ParamType::TGLenum, texture);
return CallCapture(gl::EntryPoint::ActiveTexture, std::move(paramBuffer));
}
......@@ -80,7 +81,7 @@ CallCapture CaptureBindFramebuffer(const Context *context,
{
ParamBuffer paramBuffer;
paramBuffer.addValueParam("target", ParamType::TGLenum, target);
paramBuffer.addEnumParam("target", GLenumGroup::FramebufferTarget, ParamType::TGLenum, target);
paramBuffer.addValueParam("framebuffer", ParamType::TGLuint, framebuffer);
return CallCapture(gl::EntryPoint::BindFramebuffer, std::move(paramBuffer));
......@@ -93,7 +94,7 @@ CallCapture CaptureBindRenderbuffer(const Context *context,
{
ParamBuffer paramBuffer;
paramBuffer.addValueParam("target", ParamType::TGLenum, target);
paramBuffer.addEnumParam("target", GLenumGroup::RenderbufferTarget, ParamType::TGLenum, target);
paramBuffer.addValueParam("renderbuffer", ParamType::TGLuint, renderbuffer);
return CallCapture(gl::EntryPoint::BindRenderbuffer, std::move(paramBuffer));
......@@ -133,7 +134,7 @@ CallCapture CaptureBlendEquation(const Context *context, bool isCallValid, GLenu
{
ParamBuffer paramBuffer;
paramBuffer.addValueParam("mode", ParamType::TGLenum, mode);
paramBuffer.addEnumParam("mode", GLenumGroup::BlendEquationModeEXT, ParamType::TGLenum, mode);
return CallCapture(gl::EntryPoint::BlendEquation, std::move(paramBuffer));
}
......@@ -145,8 +146,10 @@ CallCapture CaptureBlendEquationSeparate(const Context *context,
{
ParamBuffer paramBuffer;
paramBuffer.addValueParam("modeRGB", ParamType::TGLenum, modeRGB);
paramBuffer.addValueParam("modeAlpha", ParamType::TGLenum, modeAlpha);
paramBuffer.addEnumParam("modeRGB", GLenumGroup::BlendEquationModeEXT, ParamType::TGLenum,
modeRGB);
paramBuffer.addEnumParam("modeAlpha", GLenumGroup::BlendEquationModeEXT, ParamType::TGLenum,
modeAlpha);
return CallCapture(gl::EntryPoint::BlendEquationSeparate, std::move(paramBuffer));
}
......@@ -158,8 +161,8 @@ CallCapture CaptureBlendFunc(const Context *context,
{
ParamBuffer paramBuffer;
paramBuffer.addValueParam("sfactor", ParamType::TGLenum, sfactor);
paramBuffer.addValueParam("dfactor", ParamType::TGLenum, dfactor);
paramBuffer.addEnumParam("sfactor", GLenumGroup::BlendingFactor, ParamType::TGLenum, sfactor);
paramBuffer.addEnumParam("dfactor", GLenumGroup::BlendingFactor, ParamType::TGLenum, dfactor);
return CallCapture(gl::EntryPoint::BlendFunc, std::move(paramBuffer));
}
......@@ -173,10 +176,14 @@ CallCapture CaptureBlendFuncSeparate(const Context *context,
{
ParamBuffer paramBuffer;
paramBuffer.addValueParam("sfactorRGB", ParamType::TGLenum, sfactorRGB);
paramBuffer.addValueParam("dfactorRGB", ParamType::TGLenum, dfactorRGB);
paramBuffer.addValueParam("sfactorAlpha", ParamType::TGLenum, sfactorAlpha);
paramBuffer.addValueParam("dfactorAlpha", ParamType::TGLenum, dfactorAlpha);
paramBuffer.addEnumParam("sfactorRGB", GLenumGroup::BlendingFactor, ParamType::TGLenum,
sfactorRGB);
paramBuffer.addEnumParam("dfactorRGB", GLenumGroup::BlendingFactor, ParamType::TGLenum,
dfactorRGB);
paramBuffer.addEnumParam("sfactorAlpha", GLenumGroup::BlendingFactor, ParamType::TGLenum,
sfactorAlpha);
paramBuffer.addEnumParam("dfactorAlpha", GLenumGroup::BlendingFactor, ParamType::TGLenum,
dfactorAlpha);
return CallCapture(gl::EntryPoint::BlendFuncSeparate, std::move(paramBuffer));
}
......@@ -231,7 +238,7 @@ CallCapture CaptureCheckFramebufferStatus(const Context *context,
{
ParamBuffer paramBuffer;
paramBuffer.addValueParam("target", ParamType::TGLenum, target);
paramBuffer.addEnumParam("target", GLenumGroup::FramebufferTarget, ParamType::TGLenum, target);
ParamCapture returnValueCapture("returnValue", ParamType::TGLenum);
InitParamValue(ParamType::TGLenum, returnValue, &returnValueCapture.value);
......@@ -244,7 +251,7 @@ CallCapture CaptureClear(const Context *context, bool isCallValid, GLbitfield ma
{
ParamBuffer paramBuffer;
paramBuffer.addValueParam("mask", ParamType::TGLbitfield, mask);
paramBuffer.addEnumParam("mask", GLenumGroup::ClearBufferMask, ParamType::TGLbitfield, mask);
return CallCapture(gl::EntryPoint::Clear, std::move(paramBuffer));
}
......@@ -325,7 +332,8 @@ CallCapture CaptureCompressedTexImage2D(const Context *context,
paramBuffer.addValueParam("targetPacked", ParamType::TTextureTarget, targetPacked);
paramBuffer.addValueParam("level", ParamType::TGLint, level);
paramBuffer.addValueParam("internalformat", ParamType::TGLenum, internalformat);
paramBuffer.addEnumParam("internalformat", GLenumGroup::InternalFormat, ParamType::TGLenum,
internalformat);
paramBuffer.addValueParam("width", ParamType::TGLsizei, width);
paramBuffer.addValueParam("height", ParamType::TGLsizei, height);
paramBuffer.addValueParam("border", ParamType::TGLint, border);
......@@ -360,7 +368,7 @@ CallCapture CaptureCompressedTexSubImage2D(const Context *context,
paramBuffer.addValueParam("yoffset", ParamType::TGLint, yoffset);
paramBuffer.addValueParam("width", ParamType::TGLsizei, width);
paramBuffer.addValueParam("height", ParamType::TGLsizei, height);
paramBuffer.addValueParam("format", ParamType::TGLenum, format);
paramBuffer.addEnumParam("format", GLenumGroup::PixelFormat, ParamType::TGLenum, format);
paramBuffer.addValueParam("imageSize", ParamType::TGLsizei, imageSize);
ParamCapture dataParam("data", ParamType::TvoidConstPointer);
......@@ -387,7 +395,8 @@ CallCapture CaptureCopyTexImage2D(const Context *context,
paramBuffer.addValueParam("targetPacked", ParamType::TTextureTarget, targetPacked);
paramBuffer.addValueParam("level", ParamType::TGLint, level);
paramBuffer.addValueParam("internalformat", ParamType::TGLenum, internalformat);
paramBuffer.addEnumParam("internalformat", GLenumGroup::InternalFormat, ParamType::TGLenum,
internalformat);
paramBuffer.addValueParam("x", ParamType::TGLint, x);
paramBuffer.addValueParam("y", ParamType::TGLint, y);
paramBuffer.addValueParam("width", ParamType::TGLsizei, width);
......@@ -550,7 +559,7 @@ CallCapture CaptureDepthFunc(const Context *context, bool isCallValid, GLenum fu
{
ParamBuffer paramBuffer;
paramBuffer.addValueParam("func", ParamType::TGLenum, func);
paramBuffer.addEnumParam("func", GLenumGroup::DepthFunction, ParamType::TGLenum, func);
return CallCapture(gl::EntryPoint::DepthFunc, std::move(paramBuffer));
}
......@@ -591,7 +600,7 @@ CallCapture CaptureDisable(const Context *context, bool isCallValid, GLenum cap)
{
ParamBuffer paramBuffer;
paramBuffer.addValueParam("cap", ParamType::TGLenum, cap);
paramBuffer.addEnumParam("cap", GLenumGroup::EnableCap, ParamType::TGLenum, cap);
return CallCapture(gl::EntryPoint::Disable, std::move(paramBuffer));
}
......@@ -646,7 +655,7 @@ CallCapture CaptureEnable(const Context *context, bool isCallValid, GLenum cap)
{
ParamBuffer paramBuffer;
paramBuffer.addValueParam("cap", ParamType::TGLenum, cap);
paramBuffer.addEnumParam("cap", GLenumGroup::EnableCap, ParamType::TGLenum, cap);
return CallCapture(gl::EntryPoint::Enable, std::move(paramBuffer));
}
......@@ -683,9 +692,11 @@ CallCapture CaptureFramebufferRenderbuffer(const Context *context,
{
ParamBuffer paramBuffer;
paramBuffer.addValueParam("target", ParamType::TGLenum, target);
paramBuffer.addValueParam("attachment", ParamType::TGLenum, attachment);
paramBuffer.addValueParam("renderbuffertarget", ParamType::TGLenum, renderbuffertarget);
paramBuffer.addEnumParam("target", GLenumGroup::FramebufferTarget, ParamType::TGLenum, target);
paramBuffer.addEnumParam("attachment", GLenumGroup::FramebufferAttachment, ParamType::TGLenum,
attachment);
paramBuffer.addEnumParam("renderbuffertarget", GLenumGroup::RenderbufferTarget,
ParamType::TGLenum, renderbuffertarget);
paramBuffer.addValueParam("renderbuffer", ParamType::TGLuint, renderbuffer);
return CallCapture(gl::EntryPoint::FramebufferRenderbuffer, std::move(paramBuffer));
......@@ -701,8 +712,9 @@ CallCapture CaptureFramebufferTexture2D(const Context *context,
{
ParamBuffer paramBuffer;
paramBuffer.addValueParam("target", ParamType::TGLenum, target);
paramBuffer.addValueParam("attachment", ParamType::TGLenum, attachment);
paramBuffer.addEnumParam("target", GLenumGroup::FramebufferTarget, ParamType::TGLenum, target);
paramBuffer.addEnumParam("attachment", GLenumGroup::FramebufferAttachment, ParamType::TGLenum,
attachment);
paramBuffer.addValueParam("textargetPacked", ParamType::TTextureTarget, textargetPacked);
paramBuffer.addValueParam("texture", ParamType::TGLuint, texture);
paramBuffer.addValueParam("level", ParamType::TGLint, level);
......@@ -714,7 +726,7 @@ CallCapture CaptureFrontFace(const Context *context, bool isCallValid, GLenum mo
{
ParamBuffer paramBuffer;
paramBuffer.addValueParam("mode", ParamType::TGLenum, mode);
paramBuffer.addEnumParam("mode", GLenumGroup::FrontFaceDirection, ParamType::TGLenum, mode);
return CallCapture(gl::EntryPoint::FrontFace, std::move(paramBuffer));
}
......@@ -938,7 +950,7 @@ CallCapture CaptureGetBooleanv(const Context *context,
{
ParamBuffer paramBuffer;
paramBuffer.addValueParam("pname", ParamType::TGLenum, pname);
paramBuffer.addEnumParam("pname", GLenumGroup::GetPName, ParamType::TGLenum, pname);
ParamCapture dataParam("data", ParamType::TGLbooleanPointer);
InitParamValue(ParamType::TGLbooleanPointer, data, &dataParam.value);
......@@ -957,7 +969,7 @@ CallCapture CaptureGetBufferParameteriv(const Context *context,
ParamBuffer paramBuffer;
paramBuffer.addValueParam("targetPacked", ParamType::TBufferBinding, targetPacked);
paramBuffer.addValueParam("pname", ParamType::TGLenum, pname);
paramBuffer.addEnumParam("pname", GLenumGroup::DefaultGroup, ParamType::TGLenum, pname);
ParamCapture paramsParam("params", ParamType::TGLintPointer);
InitParamValue(ParamType::TGLintPointer, params, &paramsParam.value);
......@@ -983,7 +995,7 @@ CallCapture CaptureGetFloatv(const Context *context, bool isCallValid, GLenum pn
{
ParamBuffer paramBuffer;
paramBuffer.addValueParam("pname", ParamType::TGLenum, pname);
paramBuffer.addEnumParam("pname", GLenumGroup::GetPName, ParamType::TGLenum, pname);
ParamCapture dataParam("data", ParamType::TGLfloatPointer);
InitParamValue(ParamType::TGLfloatPointer, data, &dataParam.value);
......@@ -1002,9 +1014,11 @@ CallCapture CaptureGetFramebufferAttachmentParameteriv(const Context *context,
{
ParamBuffer paramBuffer;
paramBuffer.addValueParam("target", ParamType::TGLenum, target);
paramBuffer.addValueParam("attachment", ParamType::TGLenum, attachment);
paramBuffer.addValueParam("pname", ParamType::TGLenum, pname);
paramBuffer.addEnumParam("target", GLenumGroup::FramebufferTarget, ParamType::TGLenum, target);
paramBuffer.addEnumParam("attachment", GLenumGroup::FramebufferAttachment, ParamType::TGLenum,
attachment);
paramBuffer.addEnumParam("pname", GLenumGroup::FramebufferAttachmentParameterName,
ParamType::TGLenum, pname);
ParamCapture paramsParam("params", ParamType::TGLintPointer);
InitParamValue(ParamType::TGLintPointer, params, &paramsParam.value);
......@@ -1019,7 +1033,7 @@ CallCapture CaptureGetIntegerv(const Context *context, bool isCallValid, GLenum
{
ParamBuffer paramBuffer;
paramBuffer.addValueParam("pname", ParamType::TGLenum, pname);
paramBuffer.addEnumParam("pname", GLenumGroup::GetPName, ParamType::TGLenum, pname);
ParamCapture dataParam("data", ParamType::TGLintPointer);
InitParamValue(ParamType::TGLintPointer, data, &dataParam.value);
......@@ -1065,7 +1079,7 @@ CallCapture CaptureGetProgramiv(const Context *context,
ParamBuffer paramBuffer;
paramBuffer.addValueParam("program", ParamType::TGLuint, program);
paramBuffer.addValueParam("pname", ParamType::TGLenum, pname);
paramBuffer.addEnumParam("pname", GLenumGroup::ProgramPropertyARB, ParamType::TGLenum, pname);
ParamCapture paramsParam("params", ParamType::TGLintPointer);
InitParamValue(ParamType::TGLintPointer, params, &paramsParam.value);
......@@ -1083,8 +1097,9 @@ CallCapture CaptureGetRenderbufferParameteriv(const Context *context,
{
ParamBuffer paramBuffer;
paramBuffer.addValueParam("target", ParamType::TGLenum, target);
paramBuffer.addValueParam("pname", ParamType::TGLenum, pname);
paramBuffer.addEnumParam("target", GLenumGroup::RenderbufferTarget, ParamType::TGLenum, target);
paramBuffer.addEnumParam("pname", GLenumGroup::RenderbufferParameterName, ParamType::TGLenum,
pname);
ParamCapture paramsParam("params", ParamType::TGLintPointer);
InitParamValue(ParamType::TGLintPointer, params, &paramsParam.value);
......@@ -1131,8 +1146,9 @@ CallCapture CaptureGetShaderPrecisionFormat(const Context *context,
{
ParamBuffer paramBuffer;
paramBuffer.addValueParam("shadertype", ParamType::TGLenum, shadertype);
paramBuffer.addValueParam("precisiontype", ParamType::TGLenum, precisiontype);
paramBuffer.addEnumParam("shadertype", GLenumGroup::ShaderType, ParamType::TGLenum, shadertype);
paramBuffer.addEnumParam("precisiontype", GLenumGroup::PrecisionType, ParamType::TGLenum,
precisiontype);
ParamCapture rangeParam("range", ParamType::TGLintPointer);
InitParamValue(ParamType::TGLintPointer, range, &rangeParam.value);
......@@ -1185,7 +1201,7 @@ CallCapture CaptureGetShaderiv(const Context *context,
ParamBuffer paramBuffer;
paramBuffer.addValueParam("shader", ParamType::TGLuint, shader);
paramBuffer.addValueParam("pname", ParamType::TGLenum, pname);
paramBuffer.addEnumParam("pname", GLenumGroup::ShaderParameterName, ParamType::TGLenum, pname);
ParamCapture paramsParam("params", ParamType::TGLintPointer);
InitParamValue(ParamType::TGLintPointer, params, &paramsParam.value);
......@@ -1202,7 +1218,7 @@ CallCapture CaptureGetString(const Context *context,
{
ParamBuffer paramBuffer;
paramBuffer.addValueParam("name", ParamType::TGLenum, name);
paramBuffer.addEnumParam("name", GLenumGroup::StringName, ParamType::TGLenum, name);
ParamCapture returnValueCapture("returnValue", ParamType::TGLubyteConstPointer);
InitParamValue(ParamType::TGLubyteConstPointer, returnValue, &returnValueCapture.value);
......@@ -1220,7 +1236,7 @@ CallCapture CaptureGetTexParameterfv(const Context *context,
ParamBuffer paramBuffer;
paramBuffer.addValueParam("targetPacked", ParamType::TTextureType, targetPacked);
paramBuffer.addValueParam("pname", ParamType::TGLenum, pname);
paramBuffer.addEnumParam("pname", GLenumGroup::GetTextureParameter, ParamType::TGLenum, pname);
ParamCapture paramsParam("params", ParamType::TGLfloatPointer);
InitParamValue(ParamType::TGLfloatPointer, params, &paramsParam.value);
......@@ -1240,7 +1256,7 @@ CallCapture CaptureGetTexParameteriv(const Context *context,
ParamBuffer paramBuffer;
paramBuffer.addValueParam("targetPacked", ParamType::TTextureType, targetPacked);
paramBuffer.addValueParam("pname", ParamType::TGLenum, pname);
paramBuffer.addEnumParam("pname", GLenumGroup::GetTextureParameter, ParamType::TGLenum, pname);
ParamCapture paramsParam("params", ParamType::TGLintPointer);
InitParamValue(ParamType::TGLintPointer, params, &paramsParam.value);
......@@ -1320,7 +1336,7 @@ CallCapture CaptureGetVertexAttribPointerv(const Context *context,
ParamBuffer paramBuffer;
paramBuffer.addValueParam("index", ParamType::TGLuint, index);
paramBuffer.addValueParam("pname", ParamType::TGLenum, pname);
paramBuffer.addEnumParam("pname", GLenumGroup::DefaultGroup, ParamType::TGLenum, pname);
ParamCapture pointerParam("pointer", ParamType::TvoidPointerPointer);
InitParamValue(ParamType::TvoidPointerPointer, pointer, &pointerParam.value);
......@@ -1340,7 +1356,7 @@ CallCapture CaptureGetVertexAttribfv(const Context *context,
ParamBuffer paramBuffer;
paramBuffer.addValueParam("index", ParamType::TGLuint, index);
paramBuffer.addValueParam("pname", ParamType::TGLenum, pname);
paramBuffer.addEnumParam("pname", GLenumGroup::DefaultGroup, ParamType::TGLenum, pname);
ParamCapture paramsParam("params", ParamType::TGLfloatPointer);
InitParamValue(ParamType::TGLfloatPointer, params, &paramsParam.value);
......@@ -1359,7 +1375,7 @@ CallCapture CaptureGetVertexAttribiv(const Context *context,
ParamBuffer paramBuffer;
paramBuffer.addValueParam("index", ParamType::TGLuint, index);
paramBuffer.addValueParam("pname", ParamType::TGLenum, pname);
paramBuffer.addEnumParam("pname", GLenumGroup::DefaultGroup, ParamType::TGLenum, pname);
ParamCapture paramsParam("params", ParamType::TGLintPointer);
InitParamValue(ParamType::TGLintPointer, params, &paramsParam.value);
......@@ -1373,8 +1389,8 @@ CallCapture CaptureHint(const Context *context, bool isCallValid, GLenum target,
{
ParamBuffer paramBuffer;
paramBuffer.addValueParam("target", ParamType::TGLenum, target);
paramBuffer.addValueParam("mode", ParamType::TGLenum, mode);
paramBuffer.addEnumParam("target", GLenumGroup::HintTarget, ParamType::TGLenum, target);
paramBuffer.addEnumParam("mode", GLenumGroup::HintMode, ParamType::TGLenum, mode);
return CallCapture(gl::EntryPoint::Hint, std::move(paramBuffer));
}
......@@ -1402,7 +1418,7 @@ CallCapture CaptureIsEnabled(const Context *context,
{
ParamBuffer paramBuffer;
paramBuffer.addValueParam("cap", ParamType::TGLenum, cap);
paramBuffer.addEnumParam("cap", GLenumGroup::EnableCap, ParamType::TGLenum, cap);
ParamCapture returnValueCapture("returnValue", ParamType::TGLboolean);
InitParamValue(ParamType::TGLboolean, returnValue, &returnValueCapture.value);
......@@ -1513,7 +1529,7 @@ CallCapture CapturePixelStorei(const Context *context, bool isCallValid, GLenum
{
ParamBuffer paramBuffer;
paramBuffer.addValueParam("pname", ParamType::TGLenum, pname);
paramBuffer.addEnumParam("pname", GLenumGroup::PixelStoreParameter, ParamType::TGLenum, pname);
paramBuffer.addValueParam("param", ParamType::TGLint, param);
return CallCapture(gl::EntryPoint::PixelStorei, std::move(paramBuffer));
......@@ -1548,8 +1564,8 @@ CallCapture CaptureReadPixels(const Context *context,
paramBuffer.addValueParam("y", ParamType::TGLint, y);
paramBuffer.addValueParam("width", ParamType::TGLsizei, width);
paramBuffer.addValueParam("height", ParamType::TGLsizei, height);
paramBuffer.addValueParam("format", ParamType::TGLenum, format);
paramBuffer.addValueParam("type", ParamType::TGLenum, type);
paramBuffer.addEnumParam("format", GLenumGroup::PixelFormat, ParamType::TGLenum, format);
paramBuffer.addEnumParam("type", GLenumGroup::PixelType, ParamType::TGLenum, type);
ParamCapture pixelsParam("pixels", ParamType::TvoidPointer);
InitParamValue(ParamType::TvoidPointer, pixels, &pixelsParam.value);
......@@ -1576,8 +1592,9 @@ CallCapture CaptureRenderbufferStorage(const Context *context,
{
ParamBuffer paramBuffer;
paramBuffer.addValueParam("target", ParamType::TGLenum, target);
paramBuffer.addValueParam("internalformat", ParamType::TGLenum, internalformat);
paramBuffer.addEnumParam("target", GLenumGroup::RenderbufferTarget, ParamType::TGLenum, target);
paramBuffer.addEnumParam("internalformat", GLenumGroup::InternalFormat, ParamType::TGLenum,
internalformat);
paramBuffer.addValueParam("width", ParamType::TGLsizei, width);
paramBuffer.addValueParam("height", ParamType::TGLsizei, height);
......@@ -1632,7 +1649,8 @@ CallCapture CaptureShaderBinary(const Context *context,
&shadersParam);
paramBuffer.addParam(std::move(shadersParam));
paramBuffer.addValueParam("binaryformat", ParamType::TGLenum, binaryformat);
paramBuffer.addEnumParam("binaryformat", GLenumGroup::DefaultGroup, ParamType::TGLenum,
binaryformat);
ParamCapture binaryParam("binary", ParamType::TvoidConstPointer);
InitParamValue(ParamType::TvoidConstPointer, binary, &binaryParam.value);
......@@ -1678,7 +1696,7 @@ CallCapture CaptureStencilFunc(const Context *context,
{
ParamBuffer paramBuffer;
paramBuffer.addValueParam("func", ParamType::TGLenum, func);
paramBuffer.addEnumParam("func", GLenumGroup::StencilFunction, ParamType::TGLenum, func);
paramBuffer.addValueParam("ref", ParamType::TGLint, ref);
paramBuffer.addValueParam("mask", ParamType::TGLuint, mask);
......@@ -1694,8 +1712,8 @@ CallCapture CaptureStencilFuncSeparate(const Context *context,
{
ParamBuffer paramBuffer;
paramBuffer.addValueParam("face", ParamType::TGLenum, face);
paramBuffer.addValueParam("func", ParamType::TGLenum, func);
paramBuffer.addEnumParam("face", GLenumGroup::StencilFaceDirection, ParamType::TGLenum, face);
paramBuffer.addEnumParam("func", GLenumGroup::StencilFunction, ParamType::TGLenum, func);
paramBuffer.addValueParam("ref", ParamType::TGLint, ref);
paramBuffer.addValueParam("mask", ParamType::TGLuint, mask);
......@@ -1718,7 +1736,7 @@ CallCapture CaptureStencilMaskSeparate(const Context *context,
{
ParamBuffer paramBuffer;
paramBuffer.addValueParam("face", ParamType::TGLenum, face);
paramBuffer.addEnumParam("face", GLenumGroup::StencilFaceDirection, ParamType::TGLenum, face);
paramBuffer.addValueParam("mask", ParamType::TGLuint, mask);
return CallCapture(gl::EntryPoint::StencilMaskSeparate, std::move(paramBuffer));
......@@ -1732,9 +1750,9 @@ CallCapture CaptureStencilOp(const Context *context,
{
ParamBuffer paramBuffer;
paramBuffer.addValueParam("fail", ParamType::TGLenum, fail);
paramBuffer.addValueParam("zfail", ParamType::TGLenum, zfail);
paramBuffer.addValueParam("zpass", ParamType::TGLenum, zpass);
paramBuffer.addEnumParam("fail", GLenumGroup::StencilOp, ParamType::TGLenum, fail);
paramBuffer.addEnumParam("zfail", GLenumGroup::StencilOp, ParamType::TGLenum, zfail);
paramBuffer.addEnumParam("zpass", GLenumGroup::StencilOp, ParamType::TGLenum, zpass);
return CallCapture(gl::EntryPoint::StencilOp, std::move(paramBuffer));
}
......@@ -1748,10 +1766,10 @@ CallCapture CaptureStencilOpSeparate(const Context *context,
{
ParamBuffer paramBuffer;
paramBuffer.addValueParam("face", ParamType::TGLenum, face);
paramBuffer.addValueParam("sfail", ParamType::TGLenum, sfail);
paramBuffer.addValueParam("dpfail", ParamType::TGLenum, dpfail);
paramBuffer.addValueParam("dppass", ParamType::TGLenum, dppass);
paramBuffer.addEnumParam("face", GLenumGroup::StencilFaceDirection, ParamType::TGLenum, face);
paramBuffer.addEnumParam("sfail", GLenumGroup::StencilOp, ParamType::TGLenum, sfail);
paramBuffer.addEnumParam("dpfail", GLenumGroup::StencilOp, ParamType::TGLenum, dpfail);
paramBuffer.addEnumParam("dppass", GLenumGroup::StencilOp, ParamType::TGLenum, dppass);
return CallCapture(gl::EntryPoint::StencilOpSeparate, std::move(paramBuffer));
}
......@@ -1776,8 +1794,8 @@ CallCapture CaptureTexImage2D(const Context *context,
paramBuffer.addValueParam("width", ParamType::TGLsizei, width);
paramBuffer.addValueParam("height", ParamType::TGLsizei, height);
paramBuffer.addValueParam("border", ParamType::TGLint, border);
paramBuffer.addValueParam("format", ParamType::TGLenum, format);
paramBuffer.addValueParam("type", ParamType::TGLenum, type);
paramBuffer.addEnumParam("format", GLenumGroup::PixelFormat, ParamType::TGLenum, format);
paramBuffer.addEnumParam("type", GLenumGroup::PixelType, ParamType::TGLenum, type);
ParamCapture pixelsParam("pixels", ParamType::TvoidConstPointer);
InitParamValue(ParamType::TvoidConstPointer, pixels, &pixelsParam.value);
......@@ -1797,7 +1815,7 @@ CallCapture CaptureTexParameterf(const Context *context,
ParamBuffer paramBuffer;
paramBuffer.addValueParam("targetPacked", ParamType::TTextureType, targetPacked);
paramBuffer.addValueParam("pname", ParamType::TGLenum, pname);
paramBuffer.addEnumParam("pname", GLenumGroup::TextureParameterName, ParamType::TGLenum, pname);
paramBuffer.addValueParam("param", ParamType::TGLfloat, param);
return CallCapture(gl::EntryPoint::TexParameterf, std::move(paramBuffer));
......@@ -1812,7 +1830,7 @@ CallCapture CaptureTexParameterfv(const Context *context,
ParamBuffer paramBuffer;
paramBuffer.addValueParam("targetPacked", ParamType::TTextureType, targetPacked);
paramBuffer.addValueParam("pname", ParamType::TGLenum, pname);
paramBuffer.addEnumParam("pname", GLenumGroup::TextureParameterName, ParamType::TGLenum, pname);
ParamCapture paramsParam("params", ParamType::TGLfloatConstPointer);
InitParamValue(ParamType::TGLfloatConstPointer, params, &paramsParam.value);
......@@ -1831,7 +1849,7 @@ CallCapture CaptureTexParameteri(const Context *context,
ParamBuffer paramBuffer;
paramBuffer.addValueParam("targetPacked", ParamType::TTextureType, targetPacked);
paramBuffer.addValueParam("pname", ParamType::TGLenum, pname);
paramBuffer.addEnumParam("pname", GLenumGroup::TextureParameterName, ParamType::TGLenum, pname);
paramBuffer.addValueParam("param", ParamType::TGLint, param);
return CallCapture(gl::EntryPoint::TexParameteri, std::move(paramBuffer));
......@@ -1846,7 +1864,7 @@ CallCapture CaptureTexParameteriv(const Context *context,
ParamBuffer paramBuffer;
paramBuffer.addValueParam("targetPacked", ParamType::TTextureType, targetPacked);
paramBuffer.addValueParam("pname", ParamType::TGLenum, pname);
paramBuffer.addEnumParam("pname", GLenumGroup::TextureParameterName, ParamType::TGLenum, pname);
ParamCapture paramsParam("params", ParamType::TGLintConstPointer);
InitParamValue(ParamType::TGLintConstPointer, params, &paramsParam.value);
......@@ -1876,8 +1894,8 @@ CallCapture CaptureTexSubImage2D(const Context *context,
paramBuffer.addValueParam("yoffset", ParamType::TGLint, yoffset);
paramBuffer.addValueParam("width", ParamType::TGLsizei, width);
paramBuffer.addValueParam("height", ParamType::TGLsizei, height);
paramBuffer.addValueParam("format", ParamType::TGLenum, format);
paramBuffer.addValueParam("type", ParamType::TGLenum, type);
paramBuffer.addEnumParam("format", GLenumGroup::PixelFormat, ParamType::TGLenum, format);
paramBuffer.addEnumParam("type", GLenumGroup::PixelType, ParamType::TGLenum, type);
ParamCapture pixelsParam("pixels", ParamType::TvoidConstPointer);
InitParamValue(ParamType::TvoidConstPointer, pixels, &pixelsParam.value);
......
src/libANGLE/capture_gles_3_0_autogen.cpp
......@@ -12,6 +12,7 @@
#include "libANGLE/Context.h"
#include "libANGLE/FrameCapture.h"
#include "libANGLE/gl_enum_utils_autogen.h"
#include "libANGLE/validationES3.h"
using namespace angle;
......@@ -98,7 +99,8 @@ CallCapture CaptureBindTransformFeedback(const Context *context,
{
ParamBuffer paramBuffer;
paramBuffer.addValueParam("target", ParamType::TGLenum, target);
paramBuffer.addEnumParam("target", GLenumGroup::BindTransformFeedbackTarget, ParamType::TGLenum,
target);
paramBuffer.addValueParam("id", ParamType::TGLuint, id);
return CallCapture(gl::EntryPoint::BindTransformFeedback, std::move(paramBuffer));
......@@ -136,8 +138,9 @@ CallCapture CaptureBlitFramebuffer(const Context *context,
paramBuffer.addValueParam("dstY0", ParamType::TGLint, dstY0);
paramBuffer.addValueParam("dstX1", ParamType::TGLint, dstX1);
paramBuffer.addValueParam("dstY1", ParamType::TGLint, dstY1);
paramBuffer.addValueParam("mask", ParamType::TGLbitfield, mask);
paramBuffer.addValueParam("filter", ParamType::TGLenum, filter);
paramBuffer.addEnumParam("mask", GLenumGroup::ClearBufferMask, ParamType::TGLbitfield, mask);
paramBuffer.addEnumParam("filter", GLenumGroup::BlitFramebufferFilter, ParamType::TGLenum,
filter);
return CallCapture(gl::EntryPoint::BlitFramebuffer, std::move(paramBuffer));
}
......@@ -151,7 +154,7 @@ CallCapture CaptureClearBufferfi(const Context *context,
{
ParamBuffer paramBuffer;
paramBuffer.addValueParam("buffer", ParamType::TGLenum, buffer);
paramBuffer.addEnumParam("buffer", GLenumGroup::Buffer, ParamType::TGLenum, buffer);
paramBuffer.addValueParam("drawbuffer", ParamType::TGLint, drawbuffer);
paramBuffer.addValueParam("depth", ParamType::TGLfloat, depth);
paramBuffer.addValueParam("stencil", ParamType::TGLint, stencil);
......@@ -167,7 +170,7 @@ CallCapture CaptureClearBufferfv(const Context *context,
{
ParamBuffer paramBuffer;
paramBuffer.addValueParam("buffer", ParamType::TGLenum, buffer);
paramBuffer.addEnumParam("buffer", GLenumGroup::Buffer, ParamType::TGLenum, buffer);
paramBuffer.addValueParam("drawbuffer", ParamType::TGLint, drawbuffer);
ParamCapture valueParam("value", ParamType::TGLfloatConstPointer);
......@@ -186,7 +189,7 @@ CallCapture CaptureClearBufferiv(const Context *context,
{
ParamBuffer paramBuffer;
paramBuffer.addValueParam("buffer", ParamType::TGLenum, buffer);
paramBuffer.addEnumParam("buffer", GLenumGroup::Buffer, ParamType::TGLenum, buffer);
paramBuffer.addValueParam("drawbuffer", ParamType::TGLint, drawbuffer);
ParamCapture valueParam("value", ParamType::TGLintConstPointer);
......@@ -205,7 +208,7 @@ CallCapture CaptureClearBufferuiv(const Context *context,
{
ParamBuffer paramBuffer;
paramBuffer.addValueParam("buffer", ParamType::TGLenum, buffer);
paramBuffer.addEnumParam("buffer", GLenumGroup::Buffer, ParamType::TGLenum, buffer);
paramBuffer.addValueParam("drawbuffer", ParamType::TGLint, drawbuffer);
ParamCapture valueParam("value", ParamType::TGLuintConstPointer);
......@@ -226,7 +229,7 @@ CallCapture CaptureClientWaitSync(const Context *context,
ParamBuffer paramBuffer;
paramBuffer.addValueParam("sync", ParamType::TGLsync, sync);
paramBuffer.addValueParam("flags", ParamType::TGLbitfield, flags);
paramBuffer.addEnumParam("flags", GLenumGroup::SyncObjectMask, ParamType::TGLbitfield, flags);
paramBuffer.addValueParam("timeout", ParamType::TGLuint64, timeout);
ParamCapture returnValueCapture("returnValue", ParamType::TGLenum);
......@@ -252,7 +255,8 @@ CallCapture CaptureCompressedTexImage3D(const Context *context,
paramBuffer.addValueParam("targetPacked", ParamType::TTextureTarget, targetPacked);
paramBuffer.addValueParam("level", ParamType::TGLint, level);
paramBuffer.addValueParam("internalformat", ParamType::TGLenum, internalformat);
paramBuffer.addEnumParam("internalformat", GLenumGroup::InternalFormat, ParamType::TGLenum,
internalformat);
paramBuffer.addValueParam("width", ParamType::TGLsizei, width);
paramBuffer.addValueParam("height", ParamType::TGLsizei, height);
paramBuffer.addValueParam("depth", ParamType::TGLsizei, depth);
......@@ -292,7 +296,7 @@ CallCapture CaptureCompressedTexSubImage3D(const Context *context,
paramBuffer.addValueParam("width", ParamType::TGLsizei, width);
paramBuffer.addValueParam("height", ParamType::TGLsizei, height);
paramBuffer.addValueParam("depth", ParamType::TGLsizei, depth);
paramBuffer.addValueParam("format", ParamType::TGLenum, format);
paramBuffer.addEnumParam("format", GLenumGroup::PixelFormat, ParamType::TGLenum, format);
paramBuffer.addValueParam("imageSize", ParamType::TGLsizei, imageSize);
ParamCapture dataParam("data", ParamType::TvoidConstPointer);
......@@ -537,8 +541,9 @@ CallCapture CaptureFenceSync(const Context *context,
{
ParamBuffer paramBuffer;
paramBuffer.addValueParam("condition", ParamType::TGLenum, condition);
paramBuffer.addValueParam("flags", ParamType::TGLbitfield, flags);
paramBuffer.addEnumParam("condition", GLenumGroup::SyncCondition, ParamType::TGLenum,
condition);
paramBuffer.addEnumParam("flags", GLenumGroup::DefaultGroup, ParamType::TGLbitfield, flags);
ParamCapture returnValueCapture("returnValue", ParamType::TGLsync);
InitParamValue(ParamType::TGLsync, returnValue, &returnValueCapture.value);
......@@ -572,8 +577,9 @@ CallCapture CaptureFramebufferTextureLayer(const Context *context,
{
ParamBuffer paramBuffer;
paramBuffer.addValueParam("target", ParamType::TGLenum, target);
paramBuffer.addValueParam("attachment", ParamType::TGLenum, attachment);
paramBuffer.addEnumParam("target", GLenumGroup::FramebufferTarget, ParamType::TGLenum, target);
paramBuffer.addEnumParam("attachment", GLenumGroup::FramebufferAttachment, ParamType::TGLenum,
attachment);
paramBuffer.addValueParam("texture", ParamType::TGLuint, texture);
paramBuffer.addValueParam("level", ParamType::TGLint, level);
paramBuffer.addValueParam("layer", ParamType::TGLint, layer);
......@@ -687,7 +693,7 @@ CallCapture CaptureGetActiveUniformBlockiv(const Context *context,
paramBuffer.addValueParam("program", ParamType::TGLuint, program);
paramBuffer.addValueParam("uniformBlockIndex", ParamType::TGLuint, uniformBlockIndex);
paramBuffer.addValueParam("pname", ParamType::TGLenum, pname);
paramBuffer.addEnumParam("pname", GLenumGroup::UniformBlockPName, ParamType::TGLenum, pname);
ParamCapture paramsParam("params", ParamType::TGLintPointer);
InitParamValue(ParamType::TGLintPointer, params, &paramsParam.value);
......@@ -717,7 +723,7 @@ CallCapture CaptureGetActiveUniformsiv(const Context *context,
uniformIndices, pname, params, &uniformIndicesParam);
paramBuffer.addParam(std::move(uniformIndicesParam));
paramBuffer.addValueParam("pname", ParamType::TGLenum, pname);
paramBuffer.addEnumParam("pname", GLenumGroup::UniformPName, ParamType::TGLenum, pname);
ParamCapture paramsParam("params", ParamType::TGLintPointer);
InitParamValue(ParamType::TGLintPointer, params, &paramsParam.value);
......@@ -737,7 +743,7 @@ CallCapture CaptureGetBufferParameteri64v(const Context *context,
ParamBuffer paramBuffer;
paramBuffer.addValueParam("targetPacked", ParamType::TBufferBinding, targetPacked);
paramBuffer.addValueParam("pname", ParamType::TGLenum, pname);
paramBuffer.addEnumParam("pname", GLenumGroup::DefaultGroup, ParamType::TGLenum, pname);
ParamCapture paramsParam("params", ParamType::TGLint64Pointer);
InitParamValue(ParamType::TGLint64Pointer, params, &paramsParam.value);
......@@ -757,7 +763,7 @@ CallCapture CaptureGetBufferPointerv(const Context *context,
ParamBuffer paramBuffer;
paramBuffer.addValueParam("targetPacked", ParamType::TBufferBinding, targetPacked);
paramBuffer.addValueParam("pname", ParamType::TGLenum, pname);
paramBuffer.addEnumParam("pname", GLenumGroup::DefaultGroup, ParamType::TGLenum, pname);
ParamCapture paramsParam("params", ParamType::TvoidPointerPointer);
InitParamValue(ParamType::TvoidPointerPointer, params, &paramsParam.value);
......@@ -798,7 +804,7 @@ CallCapture CaptureGetInteger64i_v(const Context *context,
{
ParamBuffer paramBuffer;
paramBuffer.addValueParam("target", ParamType::TGLenum, target);
paramBuffer.addEnumParam("target", GLenumGroup::TypeEnum, ParamType::TGLenum, target);
paramBuffer.addValueParam("index", ParamType::TGLuint, index);
ParamCapture dataParam("data", ParamType::TGLint64Pointer);
......@@ -816,7 +822,7 @@ CallCapture CaptureGetInteger64v(const Context *context,
{
ParamBuffer paramBuffer;
paramBuffer.addValueParam("pname", ParamType::TGLenum, pname);
paramBuffer.addEnumParam("pname", GLenumGroup::GetPName, ParamType::TGLenum, pname);
ParamCapture dataParam("data", ParamType::TGLint64Pointer);
InitParamValue(ParamType::TGLint64Pointer, data, &dataParam.value);
......@@ -834,7 +840,7 @@ CallCapture CaptureGetIntegeri_v(const Context *context,
{
ParamBuffer paramBuffer;
paramBuffer.addValueParam("target", ParamType::TGLenum, target);
paramBuffer.addEnumParam("target", GLenumGroup::TypeEnum, ParamType::TGLenum, target);
paramBuffer.addValueParam("index", ParamType::TGLuint, index);
ParamCapture dataParam("data", ParamType::TGLintPointer);
......@@ -855,9 +861,10 @@ CallCapture CaptureGetInternalformativ(const Context *context,
{
ParamBuffer paramBuffer;
paramBuffer.addValueParam("target", ParamType::TGLenum, target);
paramBuffer.addValueParam("internalformat", ParamType::TGLenum, internalformat);
paramBuffer.addValueParam("pname", ParamType::TGLenum, pname);
paramBuffer.addEnumParam("target", GLenumGroup::TextureTarget, ParamType::TGLenum, target);
paramBuffer.addEnumParam("internalformat", GLenumGroup::InternalFormat, ParamType::TGLenum,
internalformat);
paramBuffer.addEnumParam("pname", GLenumGroup::InternalFormatPName, ParamType::TGLenum, pname);
paramBuffer.addValueParam("bufSize", ParamType::TGLsizei, bufSize);
ParamCapture paramsParam("params", ParamType::TGLintPointer);
......@@ -912,7 +919,8 @@ CallCapture CaptureGetQueryObjectuiv(const Context *context,
ParamBuffer paramBuffer;
paramBuffer.addValueParam("id", ParamType::TGLuint, id);
paramBuffer.addValueParam("pname", ParamType::TGLenum, pname);
paramBuffer.addEnumParam("pname", GLenumGroup::QueryObjectParameterName, ParamType::TGLenum,
pname);
ParamCapture paramsParam("params", ParamType::TGLuintPointer);
InitParamValue(ParamType::TGLuintPointer, params, &paramsParam.value);
......@@ -931,7 +939,7 @@ CallCapture CaptureGetQueryiv(const Context *context,
ParamBuffer paramBuffer;
paramBuffer.addValueParam("targetPacked", ParamType::TQueryType, targetPacked);
paramBuffer.addValueParam("pname", ParamType::TGLenum, pname);
paramBuffer.addEnumParam("pname", GLenumGroup::QueryParameterName, ParamType::TGLenum, pname);
ParamCapture paramsParam("params", ParamType::TGLintPointer);
InitParamValue(ParamType::TGLintPointer, params, &paramsParam.value);
......@@ -950,7 +958,7 @@ CallCapture CaptureGetSamplerParameterfv(const Context *context,
ParamBuffer paramBuffer;
paramBuffer.addValueParam("sampler", ParamType::TGLuint, sampler);
paramBuffer.addValueParam("pname", ParamType::TGLenum, pname);
paramBuffer.addEnumParam("pname", GLenumGroup::SamplerParameterName, ParamType::TGLenum, pname);
ParamCapture paramsParam("params", ParamType::TGLfloatPointer);
InitParamValue(ParamType::TGLfloatPointer, params, &paramsParam.value);
......@@ -969,7 +977,7 @@ CallCapture CaptureGetSamplerParameteriv(const Context *context,
ParamBuffer paramBuffer;
paramBuffer.addValueParam("sampler", ParamType::TGLuint, sampler);
paramBuffer.addValueParam("pname", ParamType::TGLenum, pname);
paramBuffer.addEnumParam("pname", GLenumGroup::SamplerParameterName, ParamType::TGLenum, pname);
ParamCapture paramsParam("params", ParamType::TGLintPointer);
InitParamValue(ParamType::TGLintPointer, params, &paramsParam.value);
......@@ -987,7 +995,7 @@ CallCapture CaptureGetStringi(const Context *context,
{
ParamBuffer paramBuffer;
paramBuffer.addValueParam("name", ParamType::TGLenum, name);
paramBuffer.addEnumParam("name", GLenumGroup::StringName, ParamType::TGLenum, name);
paramBuffer.addValueParam("index", ParamType::TGLuint, index);
ParamCapture returnValueCapture("returnValue", ParamType::TGLubyteConstPointer);
......@@ -1008,7 +1016,7 @@ CallCapture CaptureGetSynciv(const Context *context,
ParamBuffer paramBuffer;
paramBuffer.addValueParam("sync", ParamType::TGLsync, sync);
paramBuffer.addValueParam("pname", ParamType::TGLenum, pname);
paramBuffer.addEnumParam("pname", GLenumGroup::SyncParameterName, ParamType::TGLenum, pname);
paramBuffer.addValueParam("bufSize", ParamType::TGLsizei, bufSize);
ParamCapture lengthParam("length", ParamType::TGLsizeiPointer);
......@@ -1147,7 +1155,7 @@ CallCapture CaptureGetVertexAttribIiv(const Context *context,
ParamBuffer paramBuffer;
paramBuffer.addValueParam("index", ParamType::TGLuint, index);
paramBuffer.addValueParam("pname", ParamType::TGLenum, pname);
paramBuffer.addEnumParam("pname", GLenumGroup::VertexAttribEnum, ParamType::TGLenum, pname);
ParamCapture paramsParam("params", ParamType::TGLintPointer);
InitParamValue(ParamType::TGLintPointer, params, &paramsParam.value);
......@@ -1166,7 +1174,7 @@ CallCapture CaptureGetVertexAttribIuiv(const Context *context,
ParamBuffer paramBuffer;
paramBuffer.addValueParam("index", ParamType::TGLuint, index);
paramBuffer.addValueParam("pname", ParamType::TGLenum, pname);
paramBuffer.addEnumParam("pname", GLenumGroup::VertexAttribEnum, ParamType::TGLenum, pname);
ParamCapture paramsParam("params", ParamType::TGLuintPointer);
InitParamValue(ParamType::TGLuintPointer, params, &paramsParam.value);
......@@ -1184,7 +1192,7 @@ CallCapture CaptureInvalidateFramebuffer(const Context *context,
{
ParamBuffer paramBuffer;
paramBuffer.addValueParam("target", ParamType::TGLenum, target);
paramBuffer.addEnumParam("target", GLenumGroup::FramebufferTarget, ParamType::TGLenum, target);
paramBuffer.addValueParam("numAttachments", ParamType::TGLsizei, numAttachments);
ParamCapture attachmentsParam("attachments", ParamType::TGLenumConstPointer);
......@@ -1208,7 +1216,7 @@ CallCapture CaptureInvalidateSubFramebuffer(const Context *context,
{
ParamBuffer paramBuffer;
paramBuffer.addValueParam("target", ParamType::TGLenum, target);
paramBuffer.addEnumParam("target", GLenumGroup::DefaultGroup, ParamType::TGLenum, target);
paramBuffer.addValueParam("numAttachments", ParamType::TGLsizei, numAttachments);
ParamCapture attachmentsParam("attachments", ParamType::TGLenumConstPointer);
......@@ -1319,7 +1327,8 @@ CallCapture CaptureMapBufferRange(const Context *context,
paramBuffer.addValueParam("targetPacked", ParamType::TBufferBinding, targetPacked);
paramBuffer.addValueParam("offset", ParamType::TGLintptr, offset);
paramBuffer.addValueParam("length", ParamType::TGLsizeiptr, length);
paramBuffer.addValueParam("access", ParamType::TGLbitfield, access);
paramBuffer.addEnumParam("access", GLenumGroup::BufferAccessMask, ParamType::TGLbitfield,
access);
ParamCapture returnValueCapture("returnValue", ParamType::TvoidPointer);
InitParamValue(ParamType::TvoidPointer, returnValue, &returnValueCapture.value);
......@@ -1345,7 +1354,8 @@ CallCapture CaptureProgramBinary(const Context *context,
ParamBuffer paramBuffer;
paramBuffer.addValueParam("program", ParamType::TGLuint, program);
paramBuffer.addValueParam("binaryFormat", ParamType::TGLenum, binaryFormat);
paramBuffer.addEnumParam("binaryFormat", GLenumGroup::DefaultGroup, ParamType::TGLenum,
binaryFormat);
ParamCapture binaryParam("binary", ParamType::TvoidConstPointer);
InitParamValue(ParamType::TvoidConstPointer, binary, &binaryParam.value);
......@@ -1367,7 +1377,8 @@ CallCapture CaptureProgramParameteri(const Context *context,
ParamBuffer paramBuffer;
paramBuffer.addValueParam("program", ParamType::TGLuint, program);
paramBuffer.addValueParam("pname", ParamType::TGLenum, pname);
paramBuffer.addEnumParam("pname", GLenumGroup::ProgramParameterPName, ParamType::TGLenum,
pname);
paramBuffer.addValueParam("value", ParamType::TGLint, value);
return CallCapture(gl::EntryPoint::ProgramParameteri, std::move(paramBuffer));
......@@ -1377,7 +1388,7 @@ CallCapture CaptureReadBuffer(const Context *context, bool isCallValid, GLenum s
{
ParamBuffer paramBuffer;
paramBuffer.addValueParam("src", ParamType::TGLenum, src);
paramBuffer.addEnumParam("src", GLenumGroup::ReadBufferMode, ParamType::TGLenum, src);
return CallCapture(gl::EntryPoint::ReadBuffer, std::move(paramBuffer));
}
......@@ -1392,9 +1403,10 @@ CallCapture CaptureRenderbufferStorageMultisample(const Context *context,
{
ParamBuffer paramBuffer;
paramBuffer.addValueParam("target", ParamType::TGLenum, target);
paramBuffer.addEnumParam("target", GLenumGroup::RenderbufferTarget, ParamType::TGLenum, target);
paramBuffer.addValueParam("samples", ParamType::TGLsizei, samples);
paramBuffer.addValueParam("internalformat", ParamType::TGLenum, internalformat);
paramBuffer.addEnumParam("internalformat", GLenumGroup::InternalFormat, ParamType::TGLenum,
internalformat);
paramBuffer.addValueParam("width", ParamType::TGLsizei, width);
paramBuffer.addValueParam("height", ParamType::TGLsizei, height);
......@@ -1417,7 +1429,7 @@ CallCapture CaptureSamplerParameterf(const Context *context,
ParamBuffer paramBuffer;
paramBuffer.addValueParam("sampler", ParamType::TGLuint, sampler);
paramBuffer.addValueParam("pname", ParamType::TGLenum, pname);
paramBuffer.addEnumParam("pname", GLenumGroup::SamplerParameterName, ParamType::TGLenum, pname);
paramBuffer.addValueParam("param", ParamType::TGLfloat, param);
return CallCapture(gl::EntryPoint::SamplerParameterf, std::move(paramBuffer));
......@@ -1432,7 +1444,7 @@ CallCapture CaptureSamplerParameterfv(const Context *context,
ParamBuffer paramBuffer;
paramBuffer.addValueParam("sampler", ParamType::TGLuint, sampler);
paramBuffer.addValueParam("pname", ParamType::TGLenum, pname);
paramBuffer.addEnumParam("pname", GLenumGroup::SamplerParameterName, ParamType::TGLenum, pname);
ParamCapture paramParam("param", ParamType::TGLfloatConstPointer);
InitParamValue(ParamType::TGLfloatConstPointer, param, &paramParam.value);
......@@ -1451,7 +1463,7 @@ CallCapture CaptureSamplerParameteri(const Context *context,
ParamBuffer paramBuffer;
paramBuffer.addValueParam("sampler", ParamType::TGLuint, sampler);
paramBuffer.addValueParam("pname", ParamType::TGLenum, pname);
paramBuffer.addEnumParam("pname", GLenumGroup::SamplerParameterName, ParamType::TGLenum, pname);
paramBuffer.addValueParam("param", ParamType::TGLint, param);
return CallCapture(gl::EntryPoint::SamplerParameteri, std::move(paramBuffer));
......@@ -1466,7 +1478,7 @@ CallCapture CaptureSamplerParameteriv(const Context *context,
ParamBuffer paramBuffer;
paramBuffer.addValueParam("sampler", ParamType::TGLuint, sampler);
paramBuffer.addValueParam("pname", ParamType::TGLenum, pname);
paramBuffer.addEnumParam("pname", GLenumGroup::SamplerParameterName, ParamType::TGLenum, pname);
ParamCapture paramParam("param", ParamType::TGLintConstPointer);
InitParamValue(ParamType::TGLintConstPointer, param, &paramParam.value);
......@@ -1498,8 +1510,8 @@ CallCapture CaptureTexImage3D(const Context *context,
paramBuffer.addValueParam("height", ParamType::TGLsizei, height);
paramBuffer.addValueParam("depth", ParamType::TGLsizei, depth);
paramBuffer.addValueParam("border", ParamType::TGLint, border);
paramBuffer.addValueParam("format", ParamType::TGLenum, format);
paramBuffer.addValueParam("type", ParamType::TGLenum, type);
paramBuffer.addEnumParam("format", GLenumGroup::PixelFormat, ParamType::TGLenum, format);
paramBuffer.addEnumParam("type", GLenumGroup::PixelType, ParamType::TGLenum, type);
ParamCapture pixelsParam("pixels", ParamType::TvoidConstPointer);
InitParamValue(ParamType::TvoidConstPointer, pixels, &pixelsParam.value);
......@@ -1522,7 +1534,8 @@ CallCapture CaptureTexStorage2D(const Context *context,
paramBuffer.addValueParam("targetPacked", ParamType::TTextureType, targetPacked);
paramBuffer.addValueParam("levels", ParamType::TGLsizei, levels);
paramBuffer.addValueParam("internalformat", ParamType::TGLenum, internalformat);
paramBuffer.addEnumParam("internalformat", GLenumGroup::InternalFormat, ParamType::TGLenum,
internalformat);
paramBuffer.addValueParam("width", ParamType::TGLsizei, width);
paramBuffer.addValueParam("height", ParamType::TGLsizei, height);
......@@ -1542,7 +1555,8 @@ CallCapture CaptureTexStorage3D(const Context *context,
paramBuffer.addValueParam("targetPacked", ParamType::TTextureType, targetPacked);
paramBuffer.addValueParam("levels", ParamType::TGLsizei, levels);
paramBuffer.addValueParam("internalformat", ParamType::TGLenum, internalformat);
paramBuffer.addEnumParam("internalformat", GLenumGroup::InternalFormat, ParamType::TGLenum,
internalformat);
paramBuffer.addValueParam("width", ParamType::TGLsizei, width);
paramBuffer.addValueParam("height", ParamType::TGLsizei, height);
paramBuffer.addValueParam("depth", ParamType::TGLsizei, depth);
......@@ -1574,8 +1588,8 @@ CallCapture CaptureTexSubImage3D(const Context *context,
paramBuffer.addValueParam("width", ParamType::TGLsizei, width);
paramBuffer.addValueParam("height", ParamType::TGLsizei, height);
paramBuffer.addValueParam("depth", ParamType::TGLsizei, depth);
paramBuffer.addValueParam("format", ParamType::TGLenum, format);
paramBuffer.addValueParam("type", ParamType::TGLenum, type);
paramBuffer.addEnumParam("format", GLenumGroup::PixelFormat, ParamType::TGLenum, format);
paramBuffer.addEnumParam("type", GLenumGroup::PixelType, ParamType::TGLenum, type);
ParamCapture pixelsParam("pixels", ParamType::TvoidConstPointer);
InitParamValue(ParamType::TvoidConstPointer, pixels, &pixelsParam.value);
......@@ -1604,7 +1618,8 @@ CallCapture CaptureTransformFeedbackVaryings(const Context *context,
bufferMode, &varyingsParam);
paramBuffer.addParam(std::move(varyingsParam));
paramBuffer.addValueParam("bufferMode", ParamType::TGLenum, bufferMode);
paramBuffer.addEnumParam("bufferMode", GLenumGroup::DefaultGroup, ParamType::TGLenum,
bufferMode);
return CallCapture(gl::EntryPoint::TransformFeedbackVaryings, std::move(paramBuffer));
}
......@@ -2027,7 +2042,7 @@ CallCapture CaptureWaitSync(const Context *context,
ParamBuffer paramBuffer;
paramBuffer.addValueParam("sync", ParamType::TGLsync, sync);
paramBuffer.addValueParam("flags", ParamType::TGLbitfield, flags);
paramBuffer.addEnumParam("flags", GLenumGroup::DefaultGroup, ParamType::TGLbitfield, flags);
paramBuffer.addValueParam("timeout", ParamType::TGLuint64, timeout);
return CallCapture(gl::EntryPoint::WaitSync, std::move(paramBuffer));
......
src/libANGLE/capture_gles_3_1_autogen.cpp
......@@ -12,6 +12,7 @@
#include "libANGLE/Context.h"
#include "libANGLE/FrameCapture.h"
#include "libANGLE/gl_enum_utils_autogen.h"
#include "libANGLE/validationES31.h"
using namespace angle;
......@@ -49,8 +50,8 @@ CallCapture CaptureBindImageTexture(const Context *context,
paramBuffer.addValueParam("level", ParamType::TGLint, level);
paramBuffer.addValueParam("layered", ParamType::TGLboolean, layered);
paramBuffer.addValueParam("layer", ParamType::TGLint, layer);
paramBuffer.addValueParam("access", ParamType::TGLenum, access);
paramBuffer.addValueParam("format", ParamType::TGLenum, format);
paramBuffer.addEnumParam("access", GLenumGroup::BufferAccessARB, ParamType::TGLenum, access);
paramBuffer.addEnumParam("format", GLenumGroup::InternalFormat, ParamType::TGLenum, format);
return CallCapture(gl::EntryPoint::BindImageTexture, std::move(paramBuffer));
}
......@@ -194,8 +195,9 @@ CallCapture CaptureFramebufferParameteri(const Context *context,
{
ParamBuffer paramBuffer;
paramBuffer.addValueParam("target", ParamType::TGLenum, target);
paramBuffer.addValueParam("pname", ParamType::TGLenum, pname);
paramBuffer.addEnumParam("target", GLenumGroup::FramebufferTarget, ParamType::TGLenum, target);
paramBuffer.addEnumParam("pname", GLenumGroup::FramebufferParameterName, ParamType::TGLenum,
pname);
paramBuffer.addValueParam("param", ParamType::TGLint, param);
return CallCapture(gl::EntryPoint::FramebufferParameteri, std::move(paramBuffer));
......@@ -226,7 +228,7 @@ CallCapture CaptureGetBooleani_v(const Context *context,
{
ParamBuffer paramBuffer;
paramBuffer.addValueParam("target", ParamType::TGLenum, target);
paramBuffer.addEnumParam("target", GLenumGroup::BufferTargetARB, ParamType::TGLenum, target);
paramBuffer.addValueParam("index", ParamType::TGLuint, index);
ParamCapture dataParam("data", ParamType::TGLbooleanPointer);
......@@ -245,8 +247,9 @@ CallCapture CaptureGetFramebufferParameteriv(const Context *context,
{
ParamBuffer paramBuffer;
paramBuffer.addValueParam("target", ParamType::TGLenum, target);
paramBuffer.addValueParam("pname", ParamType::TGLenum, pname);
paramBuffer.addEnumParam("target", GLenumGroup::FramebufferTarget, ParamType::TGLenum, target);
paramBuffer.addEnumParam("pname", GLenumGroup::FramebufferAttachmentParameterName,
ParamType::TGLenum, pname);
ParamCapture paramsParam("params", ParamType::TGLintPointer);
InitParamValue(ParamType::TGLintPointer, params, &paramsParam.value);
......@@ -265,7 +268,7 @@ CallCapture CaptureGetMultisamplefv(const Context *context,
{
ParamBuffer paramBuffer;
paramBuffer.addValueParam("pname", ParamType::TGLenum, pname);
paramBuffer.addEnumParam("pname", GLenumGroup::DefaultGroup, ParamType::TGLenum, pname);
paramBuffer.addValueParam("index", ParamType::TGLuint, index);
ParamCapture valParam("val", ParamType::TGLfloatPointer);
......@@ -286,8 +289,10 @@ CallCapture CaptureGetProgramInterfaceiv(const Context *context,
ParamBuffer paramBuffer;
paramBuffer.addValueParam("program", ParamType::TGLuint, program);
paramBuffer.addValueParam("programInterface", ParamType::TGLenum, programInterface);
paramBuffer.addValueParam("pname", ParamType::TGLenum, pname);
paramBuffer.addEnumParam("programInterface", GLenumGroup::ProgramInterface, ParamType::TGLenum,
programInterface);
paramBuffer.addEnumParam("pname", GLenumGroup::ProgramInterfacePName, ParamType::TGLenum,
pname);
ParamCapture paramsParam("params", ParamType::TGLintPointer);
InitParamValue(ParamType::TGLintPointer, params, &paramsParam.value);
......@@ -334,7 +339,8 @@ CallCapture CaptureGetProgramPipelineiv(const Context *context,
ParamBuffer paramBuffer;
paramBuffer.addValueParam("pipeline", ParamType::TGLuint, pipeline);
paramBuffer.addValueParam("pname", ParamType::TGLenum, pname);
paramBuffer.addEnumParam("pname", GLenumGroup::PipelineParameterName, ParamType::TGLenum,
pname);
ParamCapture paramsParam("params", ParamType::TGLintPointer);
InitParamValue(ParamType::TGLintPointer, params, &paramsParam.value);
......@@ -354,7 +360,8 @@ CallCapture CaptureGetProgramResourceIndex(const Context *context,
ParamBuffer paramBuffer;
paramBuffer.addValueParam("program", ParamType::TGLuint, program);
paramBuffer.addValueParam("programInterface", ParamType::TGLenum, programInterface);
paramBuffer.addEnumParam("programInterface", GLenumGroup::ProgramInterface, ParamType::TGLenum,
programInterface);
ParamCapture nameParam("name", ParamType::TGLcharConstPointer);
InitParamValue(ParamType::TGLcharConstPointer, name, &nameParam.value);
......@@ -379,7 +386,8 @@ CallCapture CaptureGetProgramResourceLocation(const Context *context,
ParamBuffer paramBuffer;
paramBuffer.addValueParam("program", ParamType::TGLuint, program);
paramBuffer.addValueParam("programInterface", ParamType::TGLenum, programInterface);
paramBuffer.addEnumParam("programInterface", GLenumGroup::ProgramInterface, ParamType::TGLenum,
programInterface);
ParamCapture nameParam("name", ParamType::TGLcharConstPointer);
InitParamValue(ParamType::TGLcharConstPointer, name, &nameParam.value);
......@@ -406,7 +414,8 @@ CallCapture CaptureGetProgramResourceName(const Context *context,
ParamBuffer paramBuffer;
paramBuffer.addValueParam("program", ParamType::TGLuint, program);
paramBuffer.addValueParam("programInterface", ParamType::TGLenum, programInterface);
paramBuffer.addEnumParam("programInterface", GLenumGroup::ProgramInterface, ParamType::TGLenum,
programInterface);
paramBuffer.addValueParam("index", ParamType::TGLuint, index);
paramBuffer.addValueParam("bufSize", ParamType::TGLsizei, bufSize);
......@@ -439,7 +448,8 @@ CallCapture CaptureGetProgramResourceiv(const Context *context,
ParamBuffer paramBuffer;
paramBuffer.addValueParam("program", ParamType::TGLuint, program);
paramBuffer.addValueParam("programInterface", ParamType::TGLenum, programInterface);
paramBuffer.addEnumParam("programInterface", GLenumGroup::ProgramInterface, ParamType::TGLenum,
programInterface);
paramBuffer.addValueParam("index", ParamType::TGLuint, index);
paramBuffer.addValueParam("propCount", ParamType::TGLsizei, propCount);
......@@ -477,7 +487,7 @@ CallCapture CaptureGetTexLevelParameterfv(const Context *context,
paramBuffer.addValueParam("targetPacked", ParamType::TTextureTarget, targetPacked);
paramBuffer.addValueParam("level", ParamType::TGLint, level);
paramBuffer.addValueParam("pname", ParamType::TGLenum, pname);
paramBuffer.addEnumParam("pname", GLenumGroup::GetTextureParameter, ParamType::TGLenum, pname);
ParamCapture paramsParam("params", ParamType::TGLfloatPointer);
InitParamValue(ParamType::TGLfloatPointer, params, &paramsParam.value);
......@@ -499,7 +509,7 @@ CallCapture CaptureGetTexLevelParameteriv(const Context *context,
paramBuffer.addValueParam("targetPacked", ParamType::TTextureTarget, targetPacked);
paramBuffer.addValueParam("level", ParamType::TGLint, level);
paramBuffer.addValueParam("pname", ParamType::TGLenum, pname);
paramBuffer.addEnumParam("pname", GLenumGroup::GetTextureParameter, ParamType::TGLenum, pname);
ParamCapture paramsParam("params", ParamType::TGLintPointer);
InitParamValue(ParamType::TGLintPointer, params, &paramsParam.value);
......@@ -530,7 +540,8 @@ CallCapture CaptureMemoryBarrier(const Context *context, bool isCallValid, GLbit
{
ParamBuffer paramBuffer;
paramBuffer.addValueParam("barriers", ParamType::TGLbitfield, barriers);
paramBuffer.addEnumParam("barriers", GLenumGroup::MemoryBarrierMask, ParamType::TGLbitfield,
barriers);
return CallCapture(gl::EntryPoint::MemoryBarrier, std::move(paramBuffer));
}
......@@ -541,7 +552,8 @@ CallCapture CaptureMemoryBarrierByRegion(const Context *context,
{
ParamBuffer paramBuffer;
paramBuffer.addValueParam("barriers", ParamType::TGLbitfield, barriers);
paramBuffer.addEnumParam("barriers", GLenumGroup::MemoryBarrierMask, ParamType::TGLbitfield,
barriers);
return CallCapture(gl::EntryPoint::MemoryBarrierByRegion, std::move(paramBuffer));
}
......@@ -1250,7 +1262,7 @@ CallCapture CaptureSampleMaski(const Context *context,
ParamBuffer paramBuffer;
paramBuffer.addValueParam("maskNumber", ParamType::TGLuint, maskNumber);
paramBuffer.addValueParam("mask", ParamType::TGLbitfield, mask);
paramBuffer.addEnumParam("mask", GLenumGroup::DefaultGroup, ParamType::TGLbitfield, mask);
return CallCapture(gl::EntryPoint::SampleMaski, std::move(paramBuffer));
}
......@@ -1268,7 +1280,8 @@ CallCapture CaptureTexStorage2DMultisample(const Context *context,
paramBuffer.addValueParam("targetPacked", ParamType::TTextureType, targetPacked);
paramBuffer.addValueParam("samples", ParamType::TGLsizei, samples);
paramBuffer.addValueParam("internalformat", ParamType::TGLenum, internalformat);
paramBuffer.addEnumParam("internalformat", GLenumGroup::InternalFormat, ParamType::TGLenum,
internalformat);
paramBuffer.addValueParam("width", ParamType::TGLsizei, width);
paramBuffer.addValueParam("height", ParamType::TGLsizei, height);
paramBuffer.addValueParam("fixedsamplelocations", ParamType::TGLboolean, fixedsamplelocations);
......@@ -1285,7 +1298,8 @@ CallCapture CaptureUseProgramStages(const Context *context,
ParamBuffer paramBuffer;
paramBuffer.addValueParam("pipeline", ParamType::TGLuint, pipeline);
paramBuffer.addValueParam("stages", ParamType::TGLbitfield, stages);
paramBuffer.addEnumParam("stages", GLenumGroup::UseProgramStageMask, ParamType::TGLbitfield,
stages);
paramBuffer.addValueParam("program", ParamType::TGLuint, program);
return CallCapture(gl::EntryPoint::UseProgramStages, std::move(paramBuffer));
......
src/libANGLE/capture_gles_ext_autogen.cpp
......@@ -12,6 +12,7 @@
#include "libANGLE/Context.h"
#include "libANGLE/FrameCapture.h"
#include "libANGLE/gl_enum_utils_autogen.h"
#include "libANGLE/validationESEXT.h"
using namespace angle;
......@@ -40,7 +41,7 @@ CallCapture CaptureCopyTexture3DANGLE(const Context *context,
paramBuffer.addValueParam("destId", ParamType::TGLuint, destId);
paramBuffer.addValueParam("destLevel", ParamType::TGLint, destLevel);
paramBuffer.addValueParam("internalFormat", ParamType::TGLint, internalFormat);
paramBuffer.addValueParam("destType", ParamType::TGLenum, destType);
paramBuffer.addEnumParam("destType", GLenumGroup::DefaultGroup, ParamType::TGLenum, destType);
paramBuffer.addValueParam("unpackFlipY", ParamType::TGLboolean, unpackFlipY);
paramBuffer.addValueParam("unpackPremultiplyAlpha", ParamType::TGLboolean,
unpackPremultiplyAlpha);
......@@ -118,8 +119,9 @@ CallCapture CaptureBlitFramebufferANGLE(const Context *context,
paramBuffer.addValueParam("dstY0", ParamType::TGLint, dstY0);
paramBuffer.addValueParam("dstX1", ParamType::TGLint, dstX1);
paramBuffer.addValueParam("dstY1", ParamType::TGLint, dstY1);
paramBuffer.addValueParam("mask", ParamType::TGLbitfield, mask);
paramBuffer.addValueParam("filter", ParamType::TGLenum, filter);
paramBuffer.addEnumParam("mask", GLenumGroup::ClearBufferMask, ParamType::TGLbitfield, mask);
paramBuffer.addEnumParam("filter", GLenumGroup::BlitFramebufferFilter, ParamType::TGLenum,
filter);
return CallCapture(gl::EntryPoint::BlitFramebufferANGLE, std::move(paramBuffer));
}
......@@ -134,9 +136,10 @@ CallCapture CaptureRenderbufferStorageMultisampleANGLE(const Context *context,
{
ParamBuffer paramBuffer;
paramBuffer.addValueParam("target", ParamType::TGLenum, target);
paramBuffer.addEnumParam("target", GLenumGroup::RenderbufferTarget, ParamType::TGLenum, target);
paramBuffer.addValueParam("samples", ParamType::TGLsizei, samples);
paramBuffer.addValueParam("internalformat", ParamType::TGLenum, internalformat);
paramBuffer.addEnumParam("internalformat", GLenumGroup::InternalFormat, ParamType::TGLenum,
internalformat);
paramBuffer.addValueParam("width", ParamType::TGLsizei, width);
paramBuffer.addValueParam("height", ParamType::TGLsizei, height);
......@@ -368,7 +371,7 @@ CallCapture CaptureGetBooleanvRobustANGLE(const Context *context,
{
ParamBuffer paramBuffer;
paramBuffer.addValueParam("pname", ParamType::TGLenum, pname);
paramBuffer.addEnumParam("pname", GLenumGroup::DefaultGroup, ParamType::TGLenum, pname);
paramBuffer.addValueParam("bufSize", ParamType::TGLsizei, bufSize);
ParamCapture lengthParam("length", ParamType::TGLsizeiPointer);
......@@ -397,7 +400,7 @@ CallCapture CaptureGetBufferParameterivRobustANGLE(const Context *context,
ParamBuffer paramBuffer;
paramBuffer.addValueParam("targetPacked", ParamType::TBufferBinding, targetPacked);
paramBuffer.addValueParam("pname", ParamType::TGLenum, pname);
paramBuffer.addEnumParam("pname", GLenumGroup::DefaultGroup, ParamType::TGLenum, pname);
paramBuffer.addValueParam("bufSize", ParamType::TGLsizei, bufSize);
ParamCapture lengthParam("length", ParamType::TGLsizeiPointer);
......@@ -424,7 +427,7 @@ CallCapture CaptureGetFloatvRobustANGLE(const Context *context,
{
ParamBuffer paramBuffer;
paramBuffer.addValueParam("pname", ParamType::TGLenum, pname);
paramBuffer.addEnumParam("pname", GLenumGroup::DefaultGroup, ParamType::TGLenum, pname);
paramBuffer.addValueParam("bufSize", ParamType::TGLsizei, bufSize);
ParamCapture lengthParam("length", ParamType::TGLsizeiPointer);
......@@ -453,9 +456,10 @@ CallCapture CaptureGetFramebufferAttachmentParameterivRobustANGLE(const Context
{
ParamBuffer paramBuffer;
paramBuffer.addValueParam("target", ParamType::TGLenum, target);
paramBuffer.addValueParam("attachment", ParamType::TGLenum, attachment);
paramBuffer.addValueParam("pname", ParamType::TGLenum, pname);
paramBuffer.addEnumParam("target", GLenumGroup::DefaultGroup, ParamType::TGLenum, target);
paramBuffer.addEnumParam("attachment", GLenumGroup::DefaultGroup, ParamType::TGLenum,
attachment);
paramBuffer.addEnumParam("pname", GLenumGroup::DefaultGroup, ParamType::TGLenum, pname);
paramBuffer.addValueParam("bufSize", ParamType::TGLsizei, bufSize);
ParamCapture lengthParam("length", ParamType::TGLsizeiPointer);
......@@ -483,7 +487,7 @@ CallCapture CaptureGetIntegervRobustANGLE(const Context *context,
{
ParamBuffer paramBuffer;
paramBuffer.addValueParam("pname", ParamType::TGLenum, pname);
paramBuffer.addEnumParam("pname", GLenumGroup::DefaultGroup, ParamType::TGLenum, pname);
paramBuffer.addValueParam("bufSize", ParamType::TGLsizei, bufSize);
ParamCapture lengthParam("length", ParamType::TGLsizeiPointer);
......@@ -512,7 +516,7 @@ CallCapture CaptureGetProgramivRobustANGLE(const Context *context,
ParamBuffer paramBuffer;
paramBuffer.addValueParam("program", ParamType::TGLuint, program);
paramBuffer.addValueParam("pname", ParamType::TGLenum, pname);
paramBuffer.addEnumParam("pname", GLenumGroup::DefaultGroup, ParamType::TGLenum, pname);
paramBuffer.addValueParam("bufSize", ParamType::TGLsizei, bufSize);
ParamCapture lengthParam("length", ParamType::TGLsizeiPointer);
......@@ -540,8 +544,8 @@ CallCapture CaptureGetRenderbufferParameterivRobustANGLE(const Context *context,
{
ParamBuffer paramBuffer;
paramBuffer.addValueParam("target", ParamType::TGLenum, target);
paramBuffer.addValueParam("pname", ParamType::TGLenum, pname);
paramBuffer.addEnumParam("target", GLenumGroup::DefaultGroup, ParamType::TGLenum, target);
paramBuffer.addEnumParam("pname", GLenumGroup::DefaultGroup, ParamType::TGLenum, pname);
paramBuffer.addValueParam("bufSize", ParamType::TGLsizei, bufSize);
ParamCapture lengthParam("length", ParamType::TGLsizeiPointer);
......@@ -571,7 +575,7 @@ CallCapture CaptureGetShaderivRobustANGLE(const Context *context,
ParamBuffer paramBuffer;
paramBuffer.addValueParam("shader", ParamType::TGLuint, shader);
paramBuffer.addValueParam("pname", ParamType::TGLenum, pname);
paramBuffer.addEnumParam("pname", GLenumGroup::DefaultGroup, ParamType::TGLenum, pname);
paramBuffer.addValueParam("bufSize", ParamType::TGLsizei, bufSize);
ParamCapture lengthParam("length", ParamType::TGLsizeiPointer);
......@@ -600,7 +604,7 @@ CallCapture CaptureGetTexParameterfvRobustANGLE(const Context *context,
ParamBuffer paramBuffer;
paramBuffer.addValueParam("targetPacked", ParamType::TTextureType, targetPacked);
paramBuffer.addValueParam("pname", ParamType::TGLenum, pname);
paramBuffer.addEnumParam("pname", GLenumGroup::DefaultGroup, ParamType::TGLenum, pname);
paramBuffer.addValueParam("bufSize", ParamType::TGLsizei, bufSize);
ParamCapture lengthParam("length", ParamType::TGLsizeiPointer);
......@@ -629,7 +633,7 @@ CallCapture CaptureGetTexParameterivRobustANGLE(const Context *context,
ParamBuffer paramBuffer;
paramBuffer.addValueParam("targetPacked", ParamType::TTextureType, targetPacked);
paramBuffer.addValueParam("pname", ParamType::TGLenum, pname);
paramBuffer.addEnumParam("pname", GLenumGroup::DefaultGroup, ParamType::TGLenum, pname);
paramBuffer.addValueParam("bufSize", ParamType::TGLsizei, bufSize);
ParamCapture lengthParam("length", ParamType::TGLsizeiPointer);
......@@ -716,7 +720,7 @@ CallCapture CaptureGetVertexAttribfvRobustANGLE(const Context *context,
ParamBuffer paramBuffer;
paramBuffer.addValueParam("index", ParamType::TGLuint, index);
paramBuffer.addValueParam("pname", ParamType::TGLenum, pname);
paramBuffer.addEnumParam("pname", GLenumGroup::DefaultGroup, ParamType::TGLenum, pname);
paramBuffer.addValueParam("bufSize", ParamType::TGLsizei, bufSize);
ParamCapture lengthParam("length", ParamType::TGLsizeiPointer);
......@@ -745,7 +749,7 @@ CallCapture CaptureGetVertexAttribivRobustANGLE(const Context *context,
ParamBuffer paramBuffer;
paramBuffer.addValueParam("index", ParamType::TGLuint, index);
paramBuffer.addValueParam("pname", ParamType::TGLenum, pname);
paramBuffer.addEnumParam("pname", GLenumGroup::DefaultGroup, ParamType::TGLenum, pname);
paramBuffer.addValueParam("bufSize", ParamType::TGLsizei, bufSize);
ParamCapture lengthParam("length", ParamType::TGLsizeiPointer);
......@@ -774,7 +778,7 @@ CallCapture CaptureGetVertexAttribPointervRobustANGLE(const Context *context,
ParamBuffer paramBuffer;
paramBuffer.addValueParam("index", ParamType::TGLuint, index);
paramBuffer.addValueParam("pname", ParamType::TGLenum, pname);
paramBuffer.addEnumParam("pname", GLenumGroup::DefaultGroup, ParamType::TGLenum, pname);
paramBuffer.addValueParam("bufSize", ParamType::TGLsizei, bufSize);
ParamCapture lengthParam("length", ParamType::TGLsizeiPointer);
......@@ -812,8 +816,8 @@ CallCapture CaptureReadPixelsRobustANGLE(const Context *context,
paramBuffer.addValueParam("y", ParamType::TGLint, y);
paramBuffer.addValueParam("width", ParamType::TGLsizei, width);
paramBuffer.addValueParam("height", ParamType::TGLsizei, height);
paramBuffer.addValueParam("format", ParamType::TGLenum, format);
paramBuffer.addValueParam("type", ParamType::TGLenum, type);
paramBuffer.addEnumParam("format", GLenumGroup::DefaultGroup, ParamType::TGLenum, format);
paramBuffer.addEnumParam("type", GLenumGroup::DefaultGroup, ParamType::TGLenum, type);
paramBuffer.addValueParam("bufSize", ParamType::TGLsizei, bufSize);
ParamCapture lengthParam("length", ParamType::TGLsizeiPointer);
......@@ -864,8 +868,8 @@ CallCapture CaptureTexImage2DRobustANGLE(const Context *context,
paramBuffer.addValueParam("width", ParamType::TGLsizei, width);
paramBuffer.addValueParam("height", ParamType::TGLsizei, height);
paramBuffer.addValueParam("border", ParamType::TGLint, border);
paramBuffer.addValueParam("format", ParamType::TGLenum, format);
paramBuffer.addValueParam("type", ParamType::TGLenum, type);
paramBuffer.addEnumParam("format", GLenumGroup::DefaultGroup, ParamType::TGLenum, format);
paramBuffer.addEnumParam("type", GLenumGroup::DefaultGroup, ParamType::TGLenum, type);
paramBuffer.addValueParam("bufSize", ParamType::TGLsizei, bufSize);
ParamCapture pixelsParam("pixels", ParamType::TvoidConstPointer);
......@@ -888,7 +892,7 @@ CallCapture CaptureTexParameterfvRobustANGLE(const Context *context,
ParamBuffer paramBuffer;
paramBuffer.addValueParam("targetPacked", ParamType::TTextureType, targetPacked);
paramBuffer.addValueParam("pname", ParamType::TGLenum, pname);
paramBuffer.addEnumParam("pname", GLenumGroup::DefaultGroup, ParamType::TGLenum, pname);
paramBuffer.addValueParam("bufSize", ParamType::TGLsizei, bufSize);
ParamCapture paramsParam("params", ParamType::TGLfloatConstPointer);
......@@ -910,7 +914,7 @@ CallCapture CaptureTexParameterivRobustANGLE(const Context *context,
ParamBuffer paramBuffer;
paramBuffer.addValueParam("targetPacked", ParamType::TTextureType, targetPacked);
paramBuffer.addValueParam("pname", ParamType::TGLenum, pname);
paramBuffer.addEnumParam("pname", GLenumGroup::DefaultGroup, ParamType::TGLenum, pname);
paramBuffer.addValueParam("bufSize", ParamType::TGLsizei, bufSize);
ParamCapture paramsParam("params", ParamType::TGLintConstPointer);
......@@ -943,8 +947,8 @@ CallCapture CaptureTexSubImage2DRobustANGLE(const Context *context,
paramBuffer.addValueParam("yoffset", ParamType::TGLint, yoffset);
paramBuffer.addValueParam("width", ParamType::TGLsizei, width);
paramBuffer.addValueParam("height", ParamType::TGLsizei, height);
paramBuffer.addValueParam("format", ParamType::TGLenum, format);
paramBuffer.addValueParam("type", ParamType::TGLenum, type);
paramBuffer.addEnumParam("format", GLenumGroup::DefaultGroup, ParamType::TGLenum, format);
paramBuffer.addEnumParam("type", GLenumGroup::DefaultGroup, ParamType::TGLenum, type);
paramBuffer.addValueParam("bufSize", ParamType::TGLsizei, bufSize);
ParamCapture pixelsParam("pixels", ParamType::TvoidConstPointer);
......@@ -980,8 +984,8 @@ CallCapture CaptureTexImage3DRobustANGLE(const Context *context,
paramBuffer.addValueParam("height", ParamType::TGLsizei, height);
paramBuffer.addValueParam("depth", ParamType::TGLsizei, depth);
paramBuffer.addValueParam("border", ParamType::TGLint, border);
paramBuffer.addValueParam("format", ParamType::TGLenum, format);
paramBuffer.addValueParam("type", ParamType::TGLenum, type);
paramBuffer.addEnumParam("format", GLenumGroup::DefaultGroup, ParamType::TGLenum, format);
paramBuffer.addEnumParam("type", GLenumGroup::DefaultGroup, ParamType::TGLenum, type);
paramBuffer.addValueParam("bufSize", ParamType::TGLsizei, bufSize);
ParamCapture pixelsParam("pixels", ParamType::TvoidConstPointer);
......@@ -1019,8 +1023,8 @@ CallCapture CaptureTexSubImage3DRobustANGLE(const Context *context,
paramBuffer.addValueParam("width", ParamType::TGLsizei, width);
paramBuffer.addValueParam("height", ParamType::TGLsizei, height);
paramBuffer.addValueParam("depth", ParamType::TGLsizei, depth);
paramBuffer.addValueParam("format", ParamType::TGLenum, format);
paramBuffer.addValueParam("type", ParamType::TGLenum, type);
paramBuffer.addEnumParam("format", GLenumGroup::DefaultGroup, ParamType::TGLenum, format);
paramBuffer.addEnumParam("type", GLenumGroup::DefaultGroup, ParamType::TGLenum, type);
paramBuffer.addValueParam("bufSize", ParamType::TGLsizei, bufSize);
ParamCapture pixelsParam("pixels", ParamType::TvoidConstPointer);
......@@ -1049,7 +1053,8 @@ CallCapture CaptureCompressedTexImage2DRobustANGLE(const Context *context,
paramBuffer.addValueParam("targetPacked", ParamType::TTextureTarget, targetPacked);
paramBuffer.addValueParam("level", ParamType::TGLint, level);
paramBuffer.addValueParam("internalformat", ParamType::TGLenum, internalformat);
paramBuffer.addEnumParam("internalformat", GLenumGroup::DefaultGroup, ParamType::TGLenum,
internalformat);
paramBuffer.addValueParam("width", ParamType::TGLsizei, width);
paramBuffer.addValueParam("height", ParamType::TGLsizei, height);
paramBuffer.addValueParam("border", ParamType::TGLint, border);
......@@ -1087,7 +1092,7 @@ CallCapture CaptureCompressedTexSubImage2DRobustANGLE(const Context *context,
paramBuffer.addValueParam("yoffset", ParamType::TGLsizei, yoffset);
paramBuffer.addValueParam("width", ParamType::TGLsizei, width);
paramBuffer.addValueParam("height", ParamType::TGLsizei, height);
paramBuffer.addValueParam("format", ParamType::TGLenum, format);
paramBuffer.addEnumParam("format", GLenumGroup::DefaultGroup, ParamType::TGLenum, format);
paramBuffer.addValueParam("imageSize", ParamType::TGLsizei, imageSize);
paramBuffer.addValueParam("dataSize", ParamType::TGLsizei, dataSize);
......@@ -1118,7 +1123,8 @@ CallCapture CaptureCompressedTexImage3DRobustANGLE(const Context *context,
paramBuffer.addValueParam("targetPacked", ParamType::TTextureTarget, targetPacked);
paramBuffer.addValueParam("level", ParamType::TGLint, level);
paramBuffer.addValueParam("internalformat", ParamType::TGLenum, internalformat);
paramBuffer.addEnumParam("internalformat", GLenumGroup::DefaultGroup, ParamType::TGLenum,
internalformat);
paramBuffer.addValueParam("width", ParamType::TGLsizei, width);
paramBuffer.addValueParam("height", ParamType::TGLsizei, height);
paramBuffer.addValueParam("depth", ParamType::TGLsizei, depth);
......@@ -1161,7 +1167,7 @@ CallCapture CaptureCompressedTexSubImage3DRobustANGLE(const Context *context,
paramBuffer.addValueParam("width", ParamType::TGLsizei, width);
paramBuffer.addValueParam("height", ParamType::TGLsizei, height);
paramBuffer.addValueParam("depth", ParamType::TGLsizei, depth);
paramBuffer.addValueParam("format", ParamType::TGLenum, format);
paramBuffer.addEnumParam("format", GLenumGroup::DefaultGroup, ParamType::TGLenum, format);
paramBuffer.addValueParam("imageSize", ParamType::TGLsizei, imageSize);
paramBuffer.addValueParam("dataSize", ParamType::TGLsizei, dataSize);
......@@ -1186,7 +1192,7 @@ CallCapture CaptureGetQueryivRobustANGLE(const Context *context,
ParamBuffer paramBuffer;
paramBuffer.addValueParam("targetPacked", ParamType::TQueryType, targetPacked);
paramBuffer.addValueParam("pname", ParamType::TGLenum, pname);
paramBuffer.addEnumParam("pname", GLenumGroup::DefaultGroup, ParamType::TGLenum, pname);
paramBuffer.addValueParam("bufSize", ParamType::TGLsizei, bufSize);
ParamCapture lengthParam("length", ParamType::TGLsizeiPointer);
......@@ -1215,7 +1221,7 @@ CallCapture CaptureGetQueryObjectuivRobustANGLE(const Context *context,
ParamBuffer paramBuffer;
paramBuffer.addValueParam("id", ParamType::TGLuint, id);
paramBuffer.addValueParam("pname", ParamType::TGLenum, pname);
paramBuffer.addEnumParam("pname", GLenumGroup::DefaultGroup, ParamType::TGLenum, pname);
paramBuffer.addValueParam("bufSize", ParamType::TGLsizei, bufSize);
ParamCapture lengthParam("length", ParamType::TGLsizeiPointer);
......@@ -1244,7 +1250,7 @@ CallCapture CaptureGetBufferPointervRobustANGLE(const Context *context,
ParamBuffer paramBuffer;
paramBuffer.addValueParam("targetPacked", ParamType::TBufferBinding, targetPacked);
paramBuffer.addValueParam("pname", ParamType::TGLenum, pname);
paramBuffer.addEnumParam("pname", GLenumGroup::DefaultGroup, ParamType::TGLenum, pname);
paramBuffer.addValueParam("bufSize", ParamType::TGLsizei, bufSize);
ParamCapture lengthParam("length", ParamType::TGLsizeiPointer);
......@@ -1272,7 +1278,7 @@ CallCapture CaptureGetIntegeri_vRobustANGLE(const Context *context,
{
ParamBuffer paramBuffer;
paramBuffer.addValueParam("target", ParamType::TGLenum, target);
paramBuffer.addEnumParam("target", GLenumGroup::DefaultGroup, ParamType::TGLenum, target);
paramBuffer.addValueParam("index", ParamType::TGLuint, index);
paramBuffer.addValueParam("bufSize", ParamType::TGLsizei, bufSize);
......@@ -1302,9 +1308,10 @@ CallCapture CaptureGetInternalformativRobustANGLE(const Context *context,
{
ParamBuffer paramBuffer;
paramBuffer.addValueParam("target", ParamType::TGLenum, target);
paramBuffer.addValueParam("internalformat", ParamType::TGLenum, internalformat);
paramBuffer.addValueParam("pname", ParamType::TGLenum, pname);
paramBuffer.addEnumParam("target", GLenumGroup::DefaultGroup, ParamType::TGLenum, target);
paramBuffer.addEnumParam("internalformat", GLenumGroup::DefaultGroup, ParamType::TGLenum,
internalformat);
paramBuffer.addEnumParam("pname", GLenumGroup::DefaultGroup, ParamType::TGLenum, pname);
paramBuffer.addValueParam("bufSize", ParamType::TGLsizei, bufSize);
ParamCapture lengthParam("length", ParamType::TGLsizeiPointer);
......@@ -1333,7 +1340,7 @@ CallCapture CaptureGetVertexAttribIivRobustANGLE(const Context *context,
ParamBuffer paramBuffer;
paramBuffer.addValueParam("index", ParamType::TGLuint, index);
paramBuffer.addValueParam("pname", ParamType::TGLenum, pname);
paramBuffer.addEnumParam("pname", GLenumGroup::DefaultGroup, ParamType::TGLenum, pname);
paramBuffer.addValueParam("bufSize", ParamType::TGLsizei, bufSize);
ParamCapture lengthParam("length", ParamType::TGLsizeiPointer);
......@@ -1362,7 +1369,7 @@ CallCapture CaptureGetVertexAttribIuivRobustANGLE(const Context *context,
ParamBuffer paramBuffer;
paramBuffer.addValueParam("index", ParamType::TGLuint, index);
paramBuffer.addValueParam("pname", ParamType::TGLenum, pname);
paramBuffer.addEnumParam("pname", GLenumGroup::DefaultGroup, ParamType::TGLenum, pname);
paramBuffer.addValueParam("bufSize", ParamType::TGLsizei, bufSize);
ParamCapture lengthParam("length", ParamType::TGLsizeiPointer);
......@@ -1422,7 +1429,7 @@ CallCapture CaptureGetActiveUniformBlockivRobustANGLE(const Context *context,
paramBuffer.addValueParam("program", ParamType::TGLuint, program);
paramBuffer.addValueParam("uniformBlockIndex", ParamType::TGLuint, uniformBlockIndex);
paramBuffer.addValueParam("pname", ParamType::TGLenum, pname);
paramBuffer.addEnumParam("pname", GLenumGroup::DefaultGroup, ParamType::TGLenum, pname);
paramBuffer.addValueParam("bufSize", ParamType::TGLsizei, bufSize);
ParamCapture lengthParam("length", ParamType::TGLsizeiPointer);
......@@ -1451,7 +1458,7 @@ CallCapture CaptureGetInteger64vRobustANGLE(const Context *context,
{
ParamBuffer paramBuffer;
paramBuffer.addValueParam("pname", ParamType::TGLenum, pname);
paramBuffer.addEnumParam("pname", GLenumGroup::DefaultGroup, ParamType::TGLenum, pname);
paramBuffer.addValueParam("bufSize", ParamType::TGLsizei, bufSize);
ParamCapture lengthParam("length", ParamType::TGLsizeiPointer);
......@@ -1479,7 +1486,7 @@ CallCapture CaptureGetInteger64i_vRobustANGLE(const Context *context,
{
ParamBuffer paramBuffer;
paramBuffer.addValueParam("target", ParamType::TGLenum, target);
paramBuffer.addEnumParam("target", GLenumGroup::DefaultGroup, ParamType::TGLenum, target);
paramBuffer.addValueParam("index", ParamType::TGLuint, index);
paramBuffer.addValueParam("bufSize", ParamType::TGLsizei, bufSize);
......@@ -1509,7 +1516,7 @@ CallCapture CaptureGetBufferParameteri64vRobustANGLE(const Context *context,
ParamBuffer paramBuffer;
paramBuffer.addValueParam("targetPacked", ParamType::TBufferBinding, targetPacked);
paramBuffer.addValueParam("pname", ParamType::TGLenum, pname);
paramBuffer.addEnumParam("pname", GLenumGroup::DefaultGroup, ParamType::TGLenum, pname);
paramBuffer.addValueParam("bufSize", ParamType::TGLsizei, bufSize);
ParamCapture lengthParam("length", ParamType::TGLsizeiPointer);
......@@ -1559,7 +1566,7 @@ CallCapture CaptureSamplerParameterfvRobustANGLE(const Context *context,
ParamBuffer paramBuffer;
paramBuffer.addValueParam("sampler", ParamType::TGLuint, sampler);
paramBuffer.addValueParam("pname", ParamType::TGLenum, pname);
paramBuffer.addEnumParam("pname", GLenumGroup::DefaultGroup, ParamType::TGLenum, pname);
paramBuffer.addValueParam("bufSize", ParamType::TGLsizei, bufSize);
ParamCapture paramParam("param", ParamType::TGLfloatConstPointer);
......@@ -1582,7 +1589,7 @@ CallCapture CaptureGetSamplerParameterivRobustANGLE(const Context *context,
ParamBuffer paramBuffer;
paramBuffer.addValueParam("sampler", ParamType::TGLuint, sampler);
paramBuffer.addValueParam("pname", ParamType::TGLenum, pname);
paramBuffer.addEnumParam("pname", GLenumGroup::DefaultGroup, ParamType::TGLenum, pname);
paramBuffer.addValueParam("bufSize", ParamType::TGLsizei, bufSize);
ParamCapture lengthParam("length", ParamType::TGLsizeiPointer);
......@@ -1611,7 +1618,7 @@ CallCapture CaptureGetSamplerParameterfvRobustANGLE(const Context *context,
ParamBuffer paramBuffer;
paramBuffer.addValueParam("sampler", ParamType::TGLuint, sampler);
paramBuffer.addValueParam("pname", ParamType::TGLenum, pname);
paramBuffer.addEnumParam("pname", GLenumGroup::DefaultGroup, ParamType::TGLenum, pname);
paramBuffer.addValueParam("bufSize", ParamType::TGLsizei, bufSize);
ParamCapture lengthParam("length", ParamType::TGLsizeiPointer);
......@@ -1640,7 +1647,7 @@ CallCapture CaptureGetFramebufferParameterivRobustANGLE(const Context *context,
ParamBuffer paramBuffer;
paramBuffer.addValueParam("sampler", ParamType::TGLuint, sampler);
paramBuffer.addValueParam("pname", ParamType::TGLenum, pname);
paramBuffer.addEnumParam("pname", GLenumGroup::DefaultGroup, ParamType::TGLenum, pname);
paramBuffer.addValueParam("bufSize", ParamType::TGLsizei, bufSize);
ParamCapture lengthParam("length", ParamType::TGLsizeiPointer);
......@@ -1671,8 +1678,9 @@ CallCapture CaptureGetProgramInterfaceivRobustANGLE(const Context *context,
ParamBuffer paramBuffer;
paramBuffer.addValueParam("program", ParamType::TGLuint, program);
paramBuffer.addValueParam("programInterface", ParamType::TGLenum, programInterface);
paramBuffer.addValueParam("pname", ParamType::TGLenum, pname);
paramBuffer.addEnumParam("programInterface", GLenumGroup::DefaultGroup, ParamType::TGLenum,
programInterface);
paramBuffer.addEnumParam("pname", GLenumGroup::DefaultGroup, ParamType::TGLenum, pname);
paramBuffer.addValueParam("bufSize", ParamType::TGLsizei, bufSize);
ParamCapture lengthParam("length", ParamType::TGLsizeiPointer);
......@@ -1700,7 +1708,7 @@ CallCapture CaptureGetBooleani_vRobustANGLE(const Context *context,
{
ParamBuffer paramBuffer;
paramBuffer.addValueParam("target", ParamType::TGLenum, target);
paramBuffer.addEnumParam("target", GLenumGroup::DefaultGroup, ParamType::TGLenum, target);
paramBuffer.addValueParam("index", ParamType::TGLuint, index);
paramBuffer.addValueParam("bufSize", ParamType::TGLsizei, bufSize);
......@@ -1729,7 +1737,7 @@ CallCapture CaptureGetMultisamplefvRobustANGLE(const Context *context,
{
ParamBuffer paramBuffer;
paramBuffer.addValueParam("pname", ParamType::TGLenum, pname);
paramBuffer.addEnumParam("pname", GLenumGroup::DefaultGroup, ParamType::TGLenum, pname);
paramBuffer.addValueParam("index", ParamType::TGLuint, index);
paramBuffer.addValueParam("bufSize", ParamType::TGLsizei, bufSize);
......@@ -1761,7 +1769,7 @@ CallCapture CaptureGetTexLevelParameterivRobustANGLE(const Context *context,
paramBuffer.addValueParam("targetPacked", ParamType::TTextureTarget, targetPacked);
paramBuffer.addValueParam("level", ParamType::TGLint, level);
paramBuffer.addValueParam("pname", ParamType::TGLenum, pname);
paramBuffer.addEnumParam("pname", GLenumGroup::DefaultGroup, ParamType::TGLenum, pname);
paramBuffer.addValueParam("bufSize", ParamType::TGLsizei, bufSize);
ParamCapture lengthParam("length", ParamType::TGLsizeiPointer);
......@@ -1792,7 +1800,7 @@ CallCapture CaptureGetTexLevelParameterfvRobustANGLE(const Context *context,
paramBuffer.addValueParam("targetPacked", ParamType::TTextureTarget, targetPacked);
paramBuffer.addValueParam("level", ParamType::TGLint, level);
paramBuffer.addValueParam("pname", ParamType::TGLenum, pname);
paramBuffer.addEnumParam("pname", GLenumGroup::DefaultGroup, ParamType::TGLenum, pname);
paramBuffer.addValueParam("bufSize", ParamType::TGLsizei, bufSize);
ParamCapture lengthParam("length", ParamType::TGLsizeiPointer);
......@@ -1819,7 +1827,7 @@ CallCapture CaptureGetPointervRobustANGLERobustANGLE(const Context *context,
{
ParamBuffer paramBuffer;
paramBuffer.addValueParam("pname", ParamType::TGLenum, pname);
paramBuffer.addEnumParam("pname", GLenumGroup::DefaultGroup, ParamType::TGLenum, pname);
paramBuffer.addValueParam("bufSize", ParamType::TGLsizei, bufSize);
ParamCapture lengthParam("length", ParamType::TGLsizeiPointer);
......@@ -1857,8 +1865,8 @@ CallCapture CaptureReadnPixelsRobustANGLE(const Context *context,
paramBuffer.addValueParam("y", ParamType::TGLint, y);
paramBuffer.addValueParam("width", ParamType::TGLsizei, width);
paramBuffer.addValueParam("height", ParamType::TGLsizei, height);
paramBuffer.addValueParam("format", ParamType::TGLenum, format);
paramBuffer.addValueParam("type", ParamType::TGLenum, type);
paramBuffer.addEnumParam("format", GLenumGroup::DefaultGroup, ParamType::TGLenum, format);
paramBuffer.addEnumParam("type", GLenumGroup::DefaultGroup, ParamType::TGLenum, type);
paramBuffer.addValueParam("bufSize", ParamType::TGLsizei, bufSize);
ParamCapture lengthParam("length", ParamType::TGLsizeiPointer);
......@@ -1985,7 +1993,7 @@ CallCapture CaptureTexParameterIivRobustANGLE(const Context *context,
ParamBuffer paramBuffer;
paramBuffer.addValueParam("targetPacked", ParamType::TTextureType, targetPacked);
paramBuffer.addValueParam("pname", ParamType::TGLenum, pname);
paramBuffer.addEnumParam("pname", GLenumGroup::DefaultGroup, ParamType::TGLenum, pname);
paramBuffer.addValueParam("bufSize", ParamType::TGLsizei, bufSize);
ParamCapture paramsParam("params", ParamType::TGLintConstPointer);
......@@ -2007,7 +2015,7 @@ CallCapture CaptureTexParameterIuivRobustANGLE(const Context *context,
ParamBuffer paramBuffer;
paramBuffer.addValueParam("targetPacked", ParamType::TTextureType, targetPacked);
paramBuffer.addValueParam("pname", ParamType::TGLenum, pname);
paramBuffer.addEnumParam("pname", GLenumGroup::DefaultGroup, ParamType::TGLenum, pname);
paramBuffer.addValueParam("bufSize", ParamType::TGLsizei, bufSize);
ParamCapture paramsParam("params", ParamType::TGLuintConstPointer);
......@@ -2030,7 +2038,7 @@ CallCapture CaptureGetTexParameterIivRobustANGLE(const Context *context,
ParamBuffer paramBuffer;
paramBuffer.addValueParam("targetPacked", ParamType::TTextureType, targetPacked);
paramBuffer.addValueParam("pname", ParamType::TGLenum, pname);
paramBuffer.addEnumParam("pname", GLenumGroup::DefaultGroup, ParamType::TGLenum, pname);
paramBuffer.addValueParam("bufSize", ParamType::TGLsizei, bufSize);
ParamCapture lengthParam("length", ParamType::TGLsizeiPointer);
......@@ -2059,7 +2067,7 @@ CallCapture CaptureGetTexParameterIuivRobustANGLE(const Context *context,
ParamBuffer paramBuffer;
paramBuffer.addValueParam("targetPacked", ParamType::TTextureType, targetPacked);
paramBuffer.addValueParam("pname", ParamType::TGLenum, pname);
paramBuffer.addEnumParam("pname", GLenumGroup::DefaultGroup, ParamType::TGLenum, pname);
paramBuffer.addValueParam("bufSize", ParamType::TGLsizei, bufSize);
ParamCapture lengthParam("length", ParamType::TGLsizeiPointer);
......@@ -2087,7 +2095,7 @@ CallCapture CaptureSamplerParameterIivRobustANGLE(const Context *context,
ParamBuffer paramBuffer;
paramBuffer.addValueParam("sampler", ParamType::TGLuint, sampler);
paramBuffer.addValueParam("pname", ParamType::TGLenum, pname);
paramBuffer.addEnumParam("pname", GLenumGroup::DefaultGroup, ParamType::TGLenum, pname);
paramBuffer.addValueParam("bufSize", ParamType::TGLsizei, bufSize);
ParamCapture paramParam("param", ParamType::TGLintConstPointer);
......@@ -2109,7 +2117,7 @@ CallCapture CaptureSamplerParameterIuivRobustANGLE(const Context *context,
ParamBuffer paramBuffer;
paramBuffer.addValueParam("sampler", ParamType::TGLuint, sampler);
paramBuffer.addValueParam("pname", ParamType::TGLenum, pname);
paramBuffer.addEnumParam("pname", GLenumGroup::DefaultGroup, ParamType::TGLenum, pname);
paramBuffer.addValueParam("bufSize", ParamType::TGLsizei, bufSize);
ParamCapture paramParam("param", ParamType::TGLuintConstPointer);
......@@ -2132,7 +2140,7 @@ CallCapture CaptureGetSamplerParameterIivRobustANGLE(const Context *context,
ParamBuffer paramBuffer;
paramBuffer.addValueParam("sampler", ParamType::TGLuint, sampler);
paramBuffer.addValueParam("pname", ParamType::TGLenum, pname);
paramBuffer.addEnumParam("pname", GLenumGroup::DefaultGroup, ParamType::TGLenum, pname);
paramBuffer.addValueParam("bufSize", ParamType::TGLsizei, bufSize);
ParamCapture lengthParam("length", ParamType::TGLsizeiPointer);
......@@ -2161,7 +2169,7 @@ CallCapture CaptureGetSamplerParameterIuivRobustANGLE(const Context *context,
ParamBuffer paramBuffer;
paramBuffer.addValueParam("sampler", ParamType::TGLuint, sampler);
paramBuffer.addValueParam("pname", ParamType::TGLenum, pname);
paramBuffer.addEnumParam("pname", GLenumGroup::DefaultGroup, ParamType::TGLenum, pname);
paramBuffer.addValueParam("bufSize", ParamType::TGLsizei, bufSize);
ParamCapture lengthParam("length", ParamType::TGLsizeiPointer);
......@@ -2190,7 +2198,7 @@ CallCapture CaptureGetQueryObjectivRobustANGLE(const Context *context,
ParamBuffer paramBuffer;
paramBuffer.addValueParam("id", ParamType::TGLuint, id);
paramBuffer.addValueParam("pname", ParamType::TGLenum, pname);
paramBuffer.addEnumParam("pname", GLenumGroup::DefaultGroup, ParamType::TGLenum, pname);
paramBuffer.addValueParam("bufSize", ParamType::TGLsizei, bufSize);
ParamCapture lengthParam("length", ParamType::TGLsizeiPointer);
......@@ -2219,7 +2227,7 @@ CallCapture CaptureGetQueryObjecti64vRobustANGLE(const Context *context,
ParamBuffer paramBuffer;
paramBuffer.addValueParam("id", ParamType::TGLuint, id);
paramBuffer.addValueParam("pname", ParamType::TGLenum, pname);
paramBuffer.addEnumParam("pname", GLenumGroup::DefaultGroup, ParamType::TGLenum, pname);
paramBuffer.addValueParam("bufSize", ParamType::TGLsizei, bufSize);
ParamCapture lengthParam("length", ParamType::TGLsizeiPointer);
......@@ -2248,7 +2256,7 @@ CallCapture CaptureGetQueryObjectui64vRobustANGLE(const Context *context,
ParamBuffer paramBuffer;
paramBuffer.addValueParam("id", ParamType::TGLuint, id);
paramBuffer.addValueParam("pname", ParamType::TGLenum, pname);
paramBuffer.addEnumParam("pname", GLenumGroup::DefaultGroup, ParamType::TGLenum, pname);
paramBuffer.addValueParam("bufSize", ParamType::TGLsizei, bufSize);
ParamCapture lengthParam("length", ParamType::TGLsizeiPointer);
......@@ -2285,8 +2293,8 @@ CallCapture CaptureTexImage2DExternalANGLE(const Context *context,
paramBuffer.addValueParam("width", ParamType::TGLsizei, width);
paramBuffer.addValueParam("height", ParamType::TGLsizei, height);
paramBuffer.addValueParam("border", ParamType::TGLint, border);
paramBuffer.addValueParam("format", ParamType::TGLenum, format);
paramBuffer.addValueParam("type", ParamType::TGLenum, type);
paramBuffer.addEnumParam("format", GLenumGroup::PixelFormat, ParamType::TGLenum, format);
paramBuffer.addEnumParam("type", GLenumGroup::PixelType, ParamType::TGLenum, type);
return CallCapture(gl::EntryPoint::TexImage2DExternalANGLE, std::move(paramBuffer));
}
......@@ -2315,7 +2323,8 @@ CallCapture CaptureTexStorage2DMultisampleANGLE(const Context *context,
paramBuffer.addValueParam("targetPacked", ParamType::TTextureType, targetPacked);
paramBuffer.addValueParam("samples", ParamType::TGLsizei, samples);
paramBuffer.addValueParam("internalformat", ParamType::TGLenum, internalformat);
paramBuffer.addEnumParam("internalformat", GLenumGroup::DefaultGroup, ParamType::TGLenum,
internalformat);
paramBuffer.addValueParam("width", ParamType::TGLsizei, width);
paramBuffer.addValueParam("height", ParamType::TGLsizei, height);
paramBuffer.addValueParam("fixedsamplelocations", ParamType::TGLboolean, fixedsamplelocations);
......@@ -2334,7 +2343,7 @@ CallCapture CaptureGetTexLevelParameterivANGLE(const Context *context,
paramBuffer.addValueParam("targetPacked", ParamType::TTextureTarget, targetPacked);
paramBuffer.addValueParam("level", ParamType::TGLint, level);
paramBuffer.addValueParam("pname", ParamType::TGLenum, pname);
paramBuffer.addEnumParam("pname", GLenumGroup::DefaultGroup, ParamType::TGLenum, pname);
ParamCapture paramsParam("params", ParamType::TGLintPointer);
InitParamValue(ParamType::TGLintPointer, params, &paramsParam.value);
......@@ -2356,7 +2365,7 @@ CallCapture CaptureGetTexLevelParameterfvANGLE(const Context *context,
paramBuffer.addValueParam("targetPacked", ParamType::TTextureTarget, targetPacked);
paramBuffer.addValueParam("level", ParamType::TGLint, level);
paramBuffer.addValueParam("pname", ParamType::TGLenum, pname);
paramBuffer.addEnumParam("pname", GLenumGroup::DefaultGroup, ParamType::TGLenum, pname);
ParamCapture paramsParam("params", ParamType::TGLfloatPointer);
InitParamValue(ParamType::TGLfloatPointer, params, &paramsParam.value);
......@@ -2375,7 +2384,7 @@ CallCapture CaptureGetMultisamplefvANGLE(const Context *context,
{
ParamBuffer paramBuffer;
paramBuffer.addValueParam("pname", ParamType::TGLenum, pname);
paramBuffer.addEnumParam("pname", GLenumGroup::DefaultGroup, ParamType::TGLenum, pname);
paramBuffer.addValueParam("index", ParamType::TGLuint, index);
ParamCapture valParam("val", ParamType::TGLfloatPointer);
......@@ -2394,7 +2403,7 @@ CallCapture CaptureSampleMaskiANGLE(const Context *context,
ParamBuffer paramBuffer;
paramBuffer.addValueParam("maskNumber", ParamType::TGLuint, maskNumber);
paramBuffer.addValueParam("mask", ParamType::TGLbitfield, mask);
paramBuffer.addEnumParam("mask", GLenumGroup::DefaultGroup, ParamType::TGLbitfield, mask);
return CallCapture(gl::EntryPoint::SampleMaskiANGLE, std::move(paramBuffer));
}
......@@ -2480,7 +2489,7 @@ CallCapture CaptureCopyTextureCHROMIUM(const Context *context,
paramBuffer.addValueParam("destId", ParamType::TGLuint, destId);
paramBuffer.addValueParam("destLevel", ParamType::TGLint, destLevel);
paramBuffer.addValueParam("internalFormat", ParamType::TGLint, internalFormat);
paramBuffer.addValueParam("destType", ParamType::TGLenum, destType);
paramBuffer.addEnumParam("destType", GLenumGroup::DefaultGroup, ParamType::TGLenum, destType);
paramBuffer.addValueParam("unpackFlipY", ParamType::TGLboolean, unpackFlipY);
paramBuffer.addValueParam("unpackPremultiplyAlpha", ParamType::TGLboolean,
unpackPremultiplyAlpha);
......@@ -2535,7 +2544,8 @@ CallCapture CaptureCoverageModulationCHROMIUM(const Context *context,
{
ParamBuffer paramBuffer;
paramBuffer.addValueParam("components", ParamType::TGLenum, components);
paramBuffer.addEnumParam("components", GLenumGroup::DefaultGroup, ParamType::TGLenum,
components);
return CallCapture(gl::EntryPoint::CoverageModulationCHROMIUM, std::move(paramBuffer));
}
......@@ -2547,7 +2557,8 @@ CallCapture CaptureMatrixLoadfCHROMIUM(const Context *context,
{
ParamBuffer paramBuffer;
paramBuffer.addValueParam("matrixMode", ParamType::TGLenum, matrixMode);
paramBuffer.addEnumParam("matrixMode", GLenumGroup::DefaultGroup, ParamType::TGLenum,
matrixMode);
ParamCapture matrixParam("matrix", ParamType::TGLfloatConstPointer);
InitParamValue(ParamType::TGLfloatConstPointer, matrix, &matrixParam.value);
......@@ -2563,7 +2574,8 @@ CallCapture CaptureMatrixLoadIdentityCHROMIUM(const Context *context,
{
ParamBuffer paramBuffer;
paramBuffer.addValueParam("matrixMode", ParamType::TGLenum, matrixMode);
paramBuffer.addEnumParam("matrixMode", GLenumGroup::DefaultGroup, ParamType::TGLenum,
matrixMode);
return CallCapture(gl::EntryPoint::MatrixLoadIdentityCHROMIUM, std::move(paramBuffer));
}
......@@ -2647,7 +2659,7 @@ CallCapture CapturePathCommandsCHROMIUM(const Context *context,
paramBuffer.addParam(std::move(commandsParam));
paramBuffer.addValueParam("numCoords", ParamType::TGLsizei, numCoords);
paramBuffer.addValueParam("coordType", ParamType::TGLenum, coordType);
paramBuffer.addEnumParam("coordType", GLenumGroup::DefaultGroup, ParamType::TGLenum, coordType);
ParamCapture coordsParam("coords", ParamType::TvoidConstPointer);
InitParamValue(ParamType::TvoidConstPointer, coords, &coordsParam.value);
......@@ -2667,7 +2679,7 @@ CallCapture CapturePathParameterfCHROMIUM(const Context *context,
ParamBuffer paramBuffer;
paramBuffer.addValueParam("path", ParamType::TGLuint, path);
paramBuffer.addValueParam("pname", ParamType::TGLenum, pname);
paramBuffer.addEnumParam("pname", GLenumGroup::DefaultGroup, ParamType::TGLenum, pname);
paramBuffer.addValueParam("value", ParamType::TGLfloat, value);
return CallCapture(gl::EntryPoint::PathParameterfCHROMIUM, std::move(paramBuffer));
......@@ -2682,7 +2694,7 @@ CallCapture CapturePathParameteriCHROMIUM(const Context *context,
ParamBuffer paramBuffer;
paramBuffer.addValueParam("path", ParamType::TGLuint, path);
paramBuffer.addValueParam("pname", ParamType::TGLenum, pname);
paramBuffer.addEnumParam("pname", GLenumGroup::DefaultGroup, ParamType::TGLenum, pname);
paramBuffer.addValueParam("value", ParamType::TGLint, value);
return CallCapture(gl::EntryPoint::PathParameteriCHROMIUM, std::move(paramBuffer));
......@@ -2697,7 +2709,7 @@ CallCapture CaptureGetPathParameterfvCHROMIUM(const Context *context,
ParamBuffer paramBuffer;
paramBuffer.addValueParam("path", ParamType::TGLuint, path);
paramBuffer.addValueParam("pname", ParamType::TGLenum, pname);
paramBuffer.addEnumParam("pname", GLenumGroup::DefaultGroup, ParamType::TGLenum, pname);
ParamCapture valueParam("value", ParamType::TGLfloatPointer);
InitParamValue(ParamType::TGLfloatPointer, value, &valueParam.value);
......@@ -2716,7 +2728,7 @@ CallCapture CaptureGetPathParameterivCHROMIUM(const Context *context,
ParamBuffer paramBuffer;
paramBuffer.addValueParam("path", ParamType::TGLuint, path);
paramBuffer.addValueParam("pname", ParamType::TGLenum, pname);
paramBuffer.addEnumParam("pname", GLenumGroup::DefaultGroup, ParamType::TGLenum, pname);
ParamCapture valueParam("value", ParamType::TGLintPointer);
InitParamValue(ParamType::TGLintPointer, value, &valueParam.value);
......@@ -2734,7 +2746,7 @@ CallCapture CapturePathStencilFuncCHROMIUM(const Context *context,
{
ParamBuffer paramBuffer;
paramBuffer.addValueParam("func", ParamType::TGLenum, func);
paramBuffer.addEnumParam("func", GLenumGroup::DefaultGroup, ParamType::TGLenum, func);
paramBuffer.addValueParam("ref", ParamType::TGLint, ref);
paramBuffer.addValueParam("mask", ParamType::TGLuint, mask);
......@@ -2750,7 +2762,7 @@ CallCapture CaptureStencilFillPathCHROMIUM(const Context *context,
ParamBuffer paramBuffer;
paramBuffer.addValueParam("path", ParamType::TGLuint, path);
paramBuffer.addValueParam("fillMode", ParamType::TGLenum, fillMode);
paramBuffer.addEnumParam("fillMode", GLenumGroup::DefaultGroup, ParamType::TGLenum, fillMode);
paramBuffer.addValueParam("mask", ParamType::TGLuint, mask);
return CallCapture(gl::EntryPoint::StencilFillPathCHROMIUM, std::move(paramBuffer));
......@@ -2779,7 +2791,7 @@ CallCapture CaptureCoverFillPathCHROMIUM(const Context *context,
ParamBuffer paramBuffer;
paramBuffer.addValueParam("path", ParamType::TGLuint, path);
paramBuffer.addValueParam("coverMode", ParamType::TGLenum, coverMode);
paramBuffer.addEnumParam("coverMode", GLenumGroup::DefaultGroup, ParamType::TGLenum, coverMode);
return CallCapture(gl::EntryPoint::CoverFillPathCHROMIUM, std::move(paramBuffer));
}
......@@ -2792,7 +2804,7 @@ CallCapture CaptureCoverStrokePathCHROMIUM(const Context *context,
ParamBuffer paramBuffer;
paramBuffer.addValueParam("path", ParamType::TGLuint, path);
paramBuffer.addValueParam("coverMode", ParamType::TGLenum, coverMode);
paramBuffer.addEnumParam("coverMode", GLenumGroup::DefaultGroup, ParamType::TGLenum, coverMode);
return CallCapture(gl::EntryPoint::CoverStrokePathCHROMIUM, std::move(paramBuffer));
}
......@@ -2807,9 +2819,9 @@ CallCapture CaptureStencilThenCoverFillPathCHROMIUM(const Context *context,
ParamBuffer paramBuffer;
paramBuffer.addValueParam("path", ParamType::TGLuint, path);
paramBuffer.addValueParam("fillMode", ParamType::TGLenum, fillMode);
paramBuffer.addEnumParam("fillMode", GLenumGroup::DefaultGroup, ParamType::TGLenum, fillMode);
paramBuffer.addValueParam("mask", ParamType::TGLuint, mask);
paramBuffer.addValueParam("coverMode", ParamType::TGLenum, coverMode);
paramBuffer.addEnumParam("coverMode", GLenumGroup::DefaultGroup, ParamType::TGLenum, coverMode);
return CallCapture(gl::EntryPoint::StencilThenCoverFillPathCHROMIUM, std::move(paramBuffer));
}
......@@ -2826,7 +2838,7 @@ CallCapture CaptureStencilThenCoverStrokePathCHROMIUM(const Context *context,
paramBuffer.addValueParam("path", ParamType::TGLuint, path);
paramBuffer.addValueParam("reference", ParamType::TGLint, reference);
paramBuffer.addValueParam("mask", ParamType::TGLuint, mask);
paramBuffer.addValueParam("coverMode", ParamType::TGLenum, coverMode);
paramBuffer.addEnumParam("coverMode", GLenumGroup::DefaultGroup, ParamType::TGLenum, coverMode);
return CallCapture(gl::EntryPoint::StencilThenCoverStrokePathCHROMIUM, std::move(paramBuffer));
}
......@@ -2844,7 +2856,8 @@ CallCapture CaptureCoverFillPathInstancedCHROMIUM(const Context *context,
ParamBuffer paramBuffer;
paramBuffer.addValueParam("numPath", ParamType::TGLsizei, numPath);
paramBuffer.addValueParam("pathNameType", ParamType::TGLenum, pathNameType);
paramBuffer.addEnumParam("pathNameType", GLenumGroup::DefaultGroup, ParamType::TGLenum,
pathNameType);
ParamCapture pathsParam("paths", ParamType::TvoidConstPointer);
InitParamValue(ParamType::TvoidConstPointer, paths, &pathsParam.value);
......@@ -2854,8 +2867,9 @@ CallCapture CaptureCoverFillPathInstancedCHROMIUM(const Context *context,
paramBuffer.addParam(std::move(pathsParam));
paramBuffer.addValueParam("pathBase", ParamType::TGLuint, pathBase);
paramBuffer.addValueParam("coverMode", ParamType::TGLenum, coverMode);
paramBuffer.addValueParam("transformType", ParamType::TGLenum, transformType);
paramBuffer.addEnumParam("coverMode", GLenumGroup::DefaultGroup, ParamType::TGLenum, coverMode);
paramBuffer.addEnumParam("transformType", GLenumGroup::DefaultGroup, ParamType::TGLenum,
transformType);
ParamCapture transformValuesParam("transformValues", ParamType::TGLfloatConstPointer);
InitParamValue(ParamType::TGLfloatConstPointer, transformValues, &transformValuesParam.value);
......@@ -2880,7 +2894,8 @@ CallCapture CaptureCoverStrokePathInstancedCHROMIUM(const Context *context,
ParamBuffer paramBuffer;
paramBuffer.addValueParam("numPath", ParamType::TGLsizei, numPath);
paramBuffer.addValueParam("pathNameType", ParamType::TGLenum, pathNameType);
paramBuffer.addEnumParam("pathNameType", GLenumGroup::DefaultGroup, ParamType::TGLenum,
pathNameType);
ParamCapture pathsParam("paths", ParamType::TvoidConstPointer);
InitParamValue(ParamType::TvoidConstPointer, paths, &pathsParam.value);
......@@ -2890,8 +2905,9 @@ CallCapture CaptureCoverStrokePathInstancedCHROMIUM(const Context *context,
paramBuffer.addParam(std::move(pathsParam));
paramBuffer.addValueParam("pathBase", ParamType::TGLuint, pathBase);
paramBuffer.addValueParam("coverMode", ParamType::TGLenum, coverMode);
paramBuffer.addValueParam("transformType", ParamType::TGLenum, transformType);
paramBuffer.addEnumParam("coverMode", GLenumGroup::DefaultGroup, ParamType::TGLenum, coverMode);
paramBuffer.addEnumParam("transformType", GLenumGroup::DefaultGroup, ParamType::TGLenum,
transformType);
ParamCapture transformValuesParam("transformValues", ParamType::TGLfloatConstPointer);
InitParamValue(ParamType::TGLfloatConstPointer, transformValues, &transformValuesParam.value);
......@@ -2917,7 +2933,8 @@ CallCapture CaptureStencilStrokePathInstancedCHROMIUM(const Context *context,
ParamBuffer paramBuffer;
paramBuffer.addValueParam("numPath", ParamType::TGLsizei, numPath);
paramBuffer.addValueParam("pathNameType", ParamType::TGLenum, pathNameType);
paramBuffer.addEnumParam("pathNameType", GLenumGroup::DefaultGroup, ParamType::TGLenum,
pathNameType);
ParamCapture pathsParam("paths", ParamType::TvoidConstPointer);
InitParamValue(ParamType::TvoidConstPointer, paths, &pathsParam.value);
......@@ -2929,7 +2946,8 @@ CallCapture CaptureStencilStrokePathInstancedCHROMIUM(const Context *context,
paramBuffer.addValueParam("pathBase", ParamType::TGLuint, pathBase);
paramBuffer.addValueParam("reference", ParamType::TGLint, reference);
paramBuffer.addValueParam("mask", ParamType::TGLuint, mask);
paramBuffer.addValueParam("transformType", ParamType::TGLenum, transformType);
paramBuffer.addEnumParam("transformType", GLenumGroup::DefaultGroup, ParamType::TGLenum,
transformType);
ParamCapture transformValuesParam("transformValues", ParamType::TGLfloatConstPointer);
InitParamValue(ParamType::TGLfloatConstPointer, transformValues, &transformValuesParam.value);
......@@ -2955,7 +2973,8 @@ CallCapture CaptureStencilFillPathInstancedCHROMIUM(const Context *context,
ParamBuffer paramBuffer;
paramBuffer.addValueParam("numPaths", ParamType::TGLsizei, numPaths);
paramBuffer.addValueParam("pathNameType", ParamType::TGLenum, pathNameType);
paramBuffer.addEnumParam("pathNameType", GLenumGroup::DefaultGroup, ParamType::TGLenum,
pathNameType);
ParamCapture pathsParam("paths", ParamType::TvoidConstPointer);
InitParamValue(ParamType::TvoidConstPointer, paths, &pathsParam.value);
......@@ -2965,9 +2984,10 @@ CallCapture CaptureStencilFillPathInstancedCHROMIUM(const Context *context,
paramBuffer.addParam(std::move(pathsParam));
paramBuffer.addValueParam("pathBase", ParamType::TGLuint, pathBase);
paramBuffer.addValueParam("fillMode", ParamType::TGLenum, fillMode);
paramBuffer.addEnumParam("fillMode", GLenumGroup::DefaultGroup, ParamType::TGLenum, fillMode);
paramBuffer.addValueParam("mask", ParamType::TGLuint, mask);
paramBuffer.addValueParam("transformType", ParamType::TGLenum, transformType);
paramBuffer.addEnumParam("transformType", GLenumGroup::DefaultGroup, ParamType::TGLenum,
transformType);
ParamCapture transformValuesParam("transformValues", ParamType::TGLfloatConstPointer);
InitParamValue(ParamType::TGLfloatConstPointer, transformValues, &transformValuesParam.value);
......@@ -2994,7 +3014,8 @@ CallCapture CaptureStencilThenCoverFillPathInstancedCHROMIUM(const Context *cont
ParamBuffer paramBuffer;
paramBuffer.addValueParam("numPaths", ParamType::TGLsizei, numPaths);
paramBuffer.addValueParam("pathNameType", ParamType::TGLenum, pathNameType);
paramBuffer.addEnumParam("pathNameType", GLenumGroup::DefaultGroup, ParamType::TGLenum,
pathNameType);
ParamCapture pathsParam("paths", ParamType::TvoidConstPointer);
InitParamValue(ParamType::TvoidConstPointer, paths, &pathsParam.value);
......@@ -3004,10 +3025,11 @@ CallCapture CaptureStencilThenCoverFillPathInstancedCHROMIUM(const Context *cont
paramBuffer.addParam(std::move(pathsParam));
paramBuffer.addValueParam("pathBase", ParamType::TGLuint, pathBase);
paramBuffer.addValueParam("fillMode", ParamType::TGLenum, fillMode);
paramBuffer.addEnumParam("fillMode", GLenumGroup::DefaultGroup, ParamType::TGLenum, fillMode);
paramBuffer.addValueParam("mask", ParamType::TGLuint, mask);
paramBuffer.addValueParam("coverMode", ParamType::TGLenum, coverMode);
paramBuffer.addValueParam("transformType", ParamType::TGLenum, transformType);
paramBuffer.addEnumParam("coverMode", GLenumGroup::DefaultGroup, ParamType::TGLenum, coverMode);
paramBuffer.addEnumParam("transformType", GLenumGroup::DefaultGroup, ParamType::TGLenum,
transformType);
ParamCapture transformValuesParam("transformValues", ParamType::TGLfloatConstPointer);
InitParamValue(ParamType::TGLfloatConstPointer, transformValues, &transformValuesParam.value);
......@@ -3035,7 +3057,8 @@ CallCapture CaptureStencilThenCoverStrokePathInstancedCHROMIUM(const Context *co
ParamBuffer paramBuffer;
paramBuffer.addValueParam("numPaths", ParamType::TGLsizei, numPaths);
paramBuffer.addValueParam("pathNameType", ParamType::TGLenum, pathNameType);
paramBuffer.addEnumParam("pathNameType", GLenumGroup::DefaultGroup, ParamType::TGLenum,
pathNameType);
ParamCapture pathsParam("paths", ParamType::TvoidConstPointer);
InitParamValue(ParamType::TvoidConstPointer, paths, &pathsParam.value);
......@@ -3047,8 +3070,9 @@ CallCapture CaptureStencilThenCoverStrokePathInstancedCHROMIUM(const Context *co
paramBuffer.addValueParam("pathBase", ParamType::TGLuint, pathBase);
paramBuffer.addValueParam("reference", ParamType::TGLint, reference);
paramBuffer.addValueParam("mask", ParamType::TGLuint, mask);
paramBuffer.addValueParam("coverMode", ParamType::TGLenum, coverMode);
paramBuffer.addValueParam("transformType", ParamType::TGLenum, transformType);
paramBuffer.addEnumParam("coverMode", GLenumGroup::DefaultGroup, ParamType::TGLenum, coverMode);
paramBuffer.addEnumParam("transformType", GLenumGroup::DefaultGroup, ParamType::TGLenum,
transformType);
ParamCapture transformValuesParam("transformValues", ParamType::TGLfloatConstPointer);
InitParamValue(ParamType::TGLfloatConstPointer, transformValues, &transformValuesParam.value);
......@@ -3093,7 +3117,7 @@ CallCapture CaptureProgramPathFragmentInputGenCHROMIUM(const Context *context,
paramBuffer.addValueParam("program", ParamType::TGLuint, program);
paramBuffer.addValueParam("location", ParamType::TGLint, location);
paramBuffer.addValueParam("genMode", ParamType::TGLenum, genMode);
paramBuffer.addEnumParam("genMode", GLenumGroup::DefaultGroup, ParamType::TGLenum, genMode);
paramBuffer.addValueParam("components", ParamType::TGLint, components);
ParamCapture coeffsParam("coeffs", ParamType::TGLfloatConstPointer);
......@@ -3178,7 +3202,8 @@ CallCapture CaptureGetProgramResourceLocationIndexEXT(const Context *context,
ParamBuffer paramBuffer;
paramBuffer.addValueParam("program", ParamType::TGLuint, program);
paramBuffer.addValueParam("programInterface", ParamType::TGLenum, programInterface);
paramBuffer.addEnumParam("programInterface", GLenumGroup::ProgramInterface, ParamType::TGLenum,
programInterface);
ParamCapture nameParam("name", ParamType::TGLcharConstPointer);
InitParamValue(ParamType::TGLcharConstPointer, name, &nameParam.value);
......@@ -3242,7 +3267,7 @@ CallCapture CaptureDiscardFramebufferEXT(const Context *context,
{
ParamBuffer paramBuffer;
paramBuffer.addValueParam("target", ParamType::TGLenum, target);
paramBuffer.addEnumParam("target", GLenumGroup::DefaultGroup, ParamType::TGLenum, target);
paramBuffer.addValueParam("numAttachments", ParamType::TGLsizei, numAttachments);
ParamCapture attachmentsParam("attachments", ParamType::TGLenumConstPointer);
......@@ -3316,7 +3341,8 @@ CallCapture CaptureGetQueryObjecti64vEXT(const Context *context,
ParamBuffer paramBuffer;
paramBuffer.addValueParam("id", ParamType::TGLuint, id);
paramBuffer.addValueParam("pname", ParamType::TGLenum, pname);
paramBuffer.addEnumParam("pname", GLenumGroup::QueryObjectParameterName, ParamType::TGLenum,
pname);
ParamCapture paramsParam("params", ParamType::TGLint64Pointer);
InitParamValue(ParamType::TGLint64Pointer, params, &paramsParam.value);
......@@ -3335,7 +3361,8 @@ CallCapture CaptureGetQueryObjectivEXT(const Context *context,
ParamBuffer paramBuffer;
paramBuffer.addValueParam("id", ParamType::TGLuint, id);
paramBuffer.addValueParam("pname", ParamType::TGLenum, pname);
paramBuffer.addEnumParam("pname", GLenumGroup::QueryObjectParameterName, ParamType::TGLenum,
pname);
ParamCapture paramsParam("params", ParamType::TGLintPointer);
InitParamValue(ParamType::TGLintPointer, params, &paramsParam.value);
......@@ -3354,7 +3381,8 @@ CallCapture CaptureGetQueryObjectui64vEXT(const Context *context,
ParamBuffer paramBuffer;
paramBuffer.addValueParam("id", ParamType::TGLuint, id);
paramBuffer.addValueParam("pname", ParamType::TGLenum, pname);
paramBuffer.addEnumParam("pname", GLenumGroup::QueryObjectParameterName, ParamType::TGLenum,
pname);
ParamCapture paramsParam("params", ParamType::TGLuint64Pointer);
InitParamValue(ParamType::TGLuint64Pointer, params, &paramsParam.value);
......@@ -3373,7 +3401,8 @@ CallCapture CaptureGetQueryObjectuivEXT(const Context *context,
ParamBuffer paramBuffer;
paramBuffer.addValueParam("id", ParamType::TGLuint, id);
paramBuffer.addValueParam("pname", ParamType::TGLenum, pname);
paramBuffer.addEnumParam("pname", GLenumGroup::QueryObjectParameterName, ParamType::TGLenum,
pname);
ParamCapture paramsParam("params", ParamType::TGLuintPointer);
InitParamValue(ParamType::TGLuintPointer, params, &paramsParam.value);
......@@ -3392,7 +3421,7 @@ CallCapture CaptureGetQueryivEXT(const Context *context,
ParamBuffer paramBuffer;
paramBuffer.addValueParam("targetPacked", ParamType::TQueryType, targetPacked);
paramBuffer.addValueParam("pname", ParamType::TGLenum, pname);
paramBuffer.addEnumParam("pname", GLenumGroup::QueryParameterName, ParamType::TGLenum, pname);
ParamCapture paramsParam("params", ParamType::TGLintPointer);
InitParamValue(ParamType::TGLintPointer, params, &paramsParam.value);
......@@ -3457,8 +3486,9 @@ CallCapture CaptureFramebufferTextureEXT(const Context *context,
{
ParamBuffer paramBuffer;
paramBuffer.addValueParam("target", ParamType::TGLenum, target);
paramBuffer.addValueParam("attachment", ParamType::TGLenum, attachment);
paramBuffer.addEnumParam("target", GLenumGroup::FramebufferTarget, ParamType::TGLenum, target);
paramBuffer.addEnumParam("attachment", GLenumGroup::FramebufferAttachment, ParamType::TGLenum,
attachment);
paramBuffer.addValueParam("texture", ParamType::TGLuint, texture);
paramBuffer.addValueParam("level", ParamType::TGLint, level);
......@@ -3548,7 +3578,8 @@ CallCapture CaptureMapBufferRangeEXT(const Context *context,
paramBuffer.addValueParam("targetPacked", ParamType::TBufferBinding, targetPacked);
paramBuffer.addValueParam("offset", ParamType::TGLintptr, offset);
paramBuffer.addValueParam("length", ParamType::TGLsizeiptr, length);
paramBuffer.addValueParam("access", ParamType::TGLbitfield, access);
paramBuffer.addEnumParam("access", GLenumGroup::BufferAccessMask, ParamType::TGLbitfield,
access);
ParamCapture returnValueCapture("returnValue", ParamType::TvoidPointer);
InitParamValue(ParamType::TvoidPointer, returnValue, &returnValueCapture.value);
......@@ -3619,7 +3650,8 @@ CallCapture CaptureGetMemoryObjectParameterivEXT(const Context *context,
ParamBuffer paramBuffer;
paramBuffer.addValueParam("memoryObject", ParamType::TGLuint, memoryObject);
paramBuffer.addValueParam("pname", ParamType::TGLenum, pname);
paramBuffer.addEnumParam("pname", GLenumGroup::MemoryObjectParameterName, ParamType::TGLenum,
pname);
ParamCapture paramsParam("params", ParamType::TGLintPointer);
InitParamValue(ParamType::TGLintPointer, params, &paramsParam.value);
......@@ -3637,7 +3669,7 @@ CallCapture CaptureGetUnsignedBytevEXT(const Context *context,
{
ParamBuffer paramBuffer;
paramBuffer.addValueParam("pname", ParamType::TGLenum, pname);
paramBuffer.addEnumParam("pname", GLenumGroup::GetPName, ParamType::TGLenum, pname);
ParamCapture dataParam("data", ParamType::TGLubytePointer);
InitParamValue(ParamType::TGLubytePointer, data, &dataParam.value);
......@@ -3655,7 +3687,7 @@ CallCapture CaptureGetUnsignedBytei_vEXT(const Context *context,
{
ParamBuffer paramBuffer;
paramBuffer.addValueParam("target", ParamType::TGLenum, target);
paramBuffer.addEnumParam("target", GLenumGroup::DefaultGroup, ParamType::TGLenum, target);
paramBuffer.addValueParam("index", ParamType::TGLuint, index);
ParamCapture dataParam("data", ParamType::TGLubytePointer);
......@@ -3691,7 +3723,8 @@ CallCapture CaptureMemoryObjectParameterivEXT(const Context *context,
ParamBuffer paramBuffer;
paramBuffer.addValueParam("memoryObject", ParamType::TGLuint, memoryObject);
paramBuffer.addValueParam("pname", ParamType::TGLenum, pname);
paramBuffer.addEnumParam("pname", GLenumGroup::MemoryObjectParameterName, ParamType::TGLenum,
pname);
ParamCapture paramsParam("params", ParamType::TGLintConstPointer);
InitParamValue(ParamType::TGLintConstPointer, params, &paramsParam.value);
......@@ -3716,7 +3749,8 @@ CallCapture CaptureTexStorageMem2DEXT(const Context *context,
paramBuffer.addValueParam("targetPacked", ParamType::TTextureType, targetPacked);
paramBuffer.addValueParam("levels", ParamType::TGLsizei, levels);
paramBuffer.addValueParam("internalFormat", ParamType::TGLenum, internalFormat);
paramBuffer.addEnumParam("internalFormat", GLenumGroup::DefaultGroup, ParamType::TGLenum,
internalFormat);
paramBuffer.addValueParam("width", ParamType::TGLsizei, width);
paramBuffer.addValueParam("height", ParamType::TGLsizei, height);
paramBuffer.addValueParam("memory", ParamType::TGLuint, memory);
......@@ -3740,7 +3774,8 @@ CallCapture CaptureTexStorageMem2DMultisampleEXT(const Context *context,
paramBuffer.addValueParam("targetPacked", ParamType::TTextureType, targetPacked);
paramBuffer.addValueParam("samples", ParamType::TGLsizei, samples);
paramBuffer.addValueParam("internalFormat", ParamType::TGLenum, internalFormat);
paramBuffer.addEnumParam("internalFormat", GLenumGroup::DefaultGroup, ParamType::TGLenum,
internalFormat);
paramBuffer.addValueParam("width", ParamType::TGLsizei, width);
paramBuffer.addValueParam("height", ParamType::TGLsizei, height);
paramBuffer.addValueParam("fixedSampleLocations", ParamType::TGLboolean, fixedSampleLocations);
......@@ -3765,7 +3800,8 @@ CallCapture CaptureTexStorageMem3DEXT(const Context *context,
paramBuffer.addValueParam("targetPacked", ParamType::TTextureType, targetPacked);
paramBuffer.addValueParam("levels", ParamType::TGLsizei, levels);
paramBuffer.addValueParam("internalFormat", ParamType::TGLenum, internalFormat);
paramBuffer.addEnumParam("internalFormat", GLenumGroup::DefaultGroup, ParamType::TGLenum,
internalFormat);
paramBuffer.addValueParam("width", ParamType::TGLsizei, width);
paramBuffer.addValueParam("height", ParamType::TGLsizei, height);
paramBuffer.addValueParam("depth", ParamType::TGLsizei, depth);
......@@ -3791,7 +3827,8 @@ CallCapture CaptureTexStorageMem3DMultisampleEXT(const Context *context,
paramBuffer.addValueParam("targetPacked", ParamType::TTextureType, targetPacked);
paramBuffer.addValueParam("samples", ParamType::TGLsizei, samples);
paramBuffer.addValueParam("internalFormat", ParamType::TGLenum, internalFormat);
paramBuffer.addEnumParam("internalFormat", GLenumGroup::DefaultGroup, ParamType::TGLenum,
internalFormat);
paramBuffer.addValueParam("width", ParamType::TGLsizei, width);
paramBuffer.addValueParam("height", ParamType::TGLsizei, height);
paramBuffer.addValueParam("depth", ParamType::TGLsizei, depth);
......@@ -3893,8 +3930,8 @@ CallCapture CaptureReadnPixelsEXT(const Context *context,
paramBuffer.addValueParam("y", ParamType::TGLint, y);
paramBuffer.addValueParam("width", ParamType::TGLsizei, width);
paramBuffer.addValueParam("height", ParamType::TGLsizei, height);
paramBuffer.addValueParam("format", ParamType::TGLenum, format);
paramBuffer.addValueParam("type", ParamType::TGLenum, type);
paramBuffer.addEnumParam("format", GLenumGroup::PixelFormat, ParamType::TGLenum, format);
paramBuffer.addEnumParam("type", GLenumGroup::PixelType, ParamType::TGLenum, type);
paramBuffer.addValueParam("bufSize", ParamType::TGLsizei, bufSize);
ParamCapture dataParam("data", ParamType::TvoidPointer);
......@@ -3949,7 +3986,8 @@ CallCapture CaptureGetSemaphoreParameterui64vEXT(const Context *context,
ParamBuffer paramBuffer;
paramBuffer.addValueParam("semaphore", ParamType::TGLuint, semaphore);
paramBuffer.addValueParam("pname", ParamType::TGLenum, pname);
paramBuffer.addEnumParam("pname", GLenumGroup::SemaphoreParameterName, ParamType::TGLenum,
pname);
ParamCapture paramsParam("params", ParamType::TGLuint64Pointer);
InitParamValue(ParamType::TGLuint64Pointer, params, &paramsParam.value);
......@@ -3985,7 +4023,8 @@ CallCapture CaptureSemaphoreParameterui64vEXT(const Context *context,
ParamBuffer paramBuffer;
paramBuffer.addValueParam("semaphore", ParamType::TGLuint, semaphore);
paramBuffer.addValueParam("pname", ParamType::TGLenum, pname);
paramBuffer.addEnumParam("pname", GLenumGroup::SemaphoreParameterName, ParamType::TGLenum,
pname);
ParamCapture paramsParam("params", ParamType::TGLuint64ConstPointer);
InitParamValue(ParamType::TGLuint64ConstPointer, params, &paramsParam.value);
......@@ -4095,9 +4134,10 @@ CallCapture CaptureTexStorage1DEXT(const Context *context,
{
ParamBuffer paramBuffer;
paramBuffer.addValueParam("target", ParamType::TGLenum, target);
paramBuffer.addEnumParam("target", GLenumGroup::TextureTarget, ParamType::TGLenum, target);
paramBuffer.addValueParam("levels", ParamType::TGLsizei, levels);
paramBuffer.addValueParam("internalformat", ParamType::TGLenum, internalformat);
paramBuffer.addEnumParam("internalformat", GLenumGroup::InternalFormat, ParamType::TGLenum,
internalformat);
paramBuffer.addValueParam("width", ParamType::TGLsizei, width);
return CallCapture(gl::EntryPoint::TexStorage1DEXT, std::move(paramBuffer));
......@@ -4115,7 +4155,8 @@ CallCapture CaptureTexStorage2DEXT(const Context *context,
paramBuffer.addValueParam("targetPacked", ParamType::TTextureType, targetPacked);
paramBuffer.addValueParam("levels", ParamType::TGLsizei, levels);
paramBuffer.addValueParam("internalformat", ParamType::TGLenum, internalformat);
paramBuffer.addEnumParam("internalformat", GLenumGroup::InternalFormat, ParamType::TGLenum,
internalformat);
paramBuffer.addValueParam("width", ParamType::TGLsizei, width);
paramBuffer.addValueParam("height", ParamType::TGLsizei, height);
......@@ -4135,7 +4176,8 @@ CallCapture CaptureTexStorage3DEXT(const Context *context,
paramBuffer.addValueParam("targetPacked", ParamType::TTextureType, targetPacked);
paramBuffer.addValueParam("levels", ParamType::TGLsizei, levels);
paramBuffer.addValueParam("internalformat", ParamType::TGLenum, internalformat);
paramBuffer.addEnumParam("internalformat", GLenumGroup::InternalFormat, ParamType::TGLenum,
internalformat);
paramBuffer.addValueParam("width", ParamType::TGLsizei, width);
paramBuffer.addValueParam("height", ParamType::TGLsizei, height);
paramBuffer.addValueParam("depth", ParamType::TGLsizei, depth);
......@@ -4172,9 +4214,9 @@ CallCapture CaptureDebugMessageControlKHR(const Context *context,
{
ParamBuffer paramBuffer;
paramBuffer.addValueParam("source", ParamType::TGLenum, source);
paramBuffer.addValueParam("type", ParamType::TGLenum, type);
paramBuffer.addValueParam("severity", ParamType::TGLenum, severity);
paramBuffer.addEnumParam("source", GLenumGroup::DebugSource, ParamType::TGLenum, source);
paramBuffer.addEnumParam("type", GLenumGroup::DebugType, ParamType::TGLenum, type);
paramBuffer.addEnumParam("severity", GLenumGroup::DebugSeverity, ParamType::TGLenum, severity);
paramBuffer.addValueParam("count", ParamType::TGLsizei, count);
ParamCapture idsParam("ids", ParamType::TGLuintConstPointer);
......@@ -4199,10 +4241,10 @@ CallCapture CaptureDebugMessageInsertKHR(const Context *context,
{
ParamBuffer paramBuffer;
paramBuffer.addValueParam("source", ParamType::TGLenum, source);
paramBuffer.addValueParam("type", ParamType::TGLenum, type);
paramBuffer.addEnumParam("source", GLenumGroup::DebugSource, ParamType::TGLenum, source);
paramBuffer.addEnumParam("type", GLenumGroup::DebugType, ParamType::TGLenum, type);
paramBuffer.addValueParam("id", ParamType::TGLuint, id);
paramBuffer.addValueParam("severity", ParamType::TGLenum, severity);
paramBuffer.addEnumParam("severity", GLenumGroup::DebugSeverity, ParamType::TGLenum, severity);
paramBuffer.addValueParam("length", ParamType::TGLsizei, length);
ParamCapture bufParam("buf", ParamType::TGLcharConstPointer);
......@@ -4284,7 +4326,8 @@ CallCapture CaptureGetObjectLabelKHR(const Context *context,
{
ParamBuffer paramBuffer;
paramBuffer.addValueParam("identifier", ParamType::TGLenum, identifier);
paramBuffer.addEnumParam("identifier", GLenumGroup::DefaultGroup, ParamType::TGLenum,
identifier);
paramBuffer.addValueParam("name", ParamType::TGLuint, name);
paramBuffer.addValueParam("bufSize", ParamType::TGLsizei, bufSize);
......@@ -4341,7 +4384,7 @@ CallCapture CaptureGetPointervKHR(const Context *context,
{
ParamBuffer paramBuffer;
paramBuffer.addValueParam("pname", ParamType::TGLenum, pname);
paramBuffer.addEnumParam("pname", GLenumGroup::DefaultGroup, ParamType::TGLenum, pname);
ParamCapture paramsParam("params", ParamType::TvoidPointerPointer);
InitParamValue(ParamType::TvoidPointerPointer, params, &paramsParam.value);
......@@ -4360,7 +4403,8 @@ CallCapture CaptureObjectLabelKHR(const Context *context,
{
ParamBuffer paramBuffer;
paramBuffer.addValueParam("identifier", ParamType::TGLenum, identifier);
paramBuffer.addEnumParam("identifier", GLenumGroup::ObjectIdentifier, ParamType::TGLenum,
identifier);
paramBuffer.addValueParam("name", ParamType::TGLuint, name);
paramBuffer.addValueParam("length", ParamType::TGLsizei, length);
......@@ -4411,7 +4455,7 @@ CallCapture CapturePushDebugGroupKHR(const Context *context,
{
ParamBuffer paramBuffer;
paramBuffer.addValueParam("source", ParamType::TGLenum, source);
paramBuffer.addEnumParam("source", GLenumGroup::DebugSource, ParamType::TGLenum, source);
paramBuffer.addValueParam("id", ParamType::TGLuint, id);
paramBuffer.addValueParam("length", ParamType::TGLsizei, length);
......@@ -4484,7 +4528,7 @@ CallCapture CaptureGetFenceivNV(const Context *context,
ParamBuffer paramBuffer;
paramBuffer.addValueParam("fence", ParamType::TGLuint, fence);
paramBuffer.addValueParam("pname", ParamType::TGLenum, pname);
paramBuffer.addEnumParam("pname", GLenumGroup::DefaultGroup, ParamType::TGLenum, pname);
ParamCapture paramsParam("params", ParamType::TGLintPointer);
InitParamValue(ParamType::TGLintPointer, params, &paramsParam.value);
......@@ -4518,7 +4562,7 @@ CallCapture CaptureSetFenceNV(const Context *context,
ParamBuffer paramBuffer;
paramBuffer.addValueParam("fence", ParamType::TGLuint, fence);
paramBuffer.addValueParam("condition", ParamType::TGLenum, condition);
paramBuffer.addEnumParam("condition", GLenumGroup::DefaultGroup, ParamType::TGLenum, condition);
return CallCapture(gl::EntryPoint::SetFenceNV, std::move(paramBuffer));
}
......@@ -4546,7 +4590,7 @@ CallCapture CaptureEGLImageTargetRenderbufferStorageOES(const Context *context,
{
ParamBuffer paramBuffer;
paramBuffer.addValueParam("target", ParamType::TGLenum, target);
paramBuffer.addEnumParam("target", GLenumGroup::DefaultGroup, ParamType::TGLenum, target);
paramBuffer.addValueParam("image", ParamType::TGLeglImageOES, image);
return CallCapture(gl::EntryPoint::EGLImageTargetRenderbufferStorageOES,
......@@ -4697,7 +4741,7 @@ CallCapture CaptureBindFramebufferOES(const Context *context,
{
ParamBuffer paramBuffer;
paramBuffer.addValueParam("target", ParamType::TGLenum, target);
paramBuffer.addEnumParam("target", GLenumGroup::FramebufferTarget, ParamType::TGLenum, target);
paramBuffer.addValueParam("framebuffer", ParamType::TGLuint, framebuffer);
return CallCapture(gl::EntryPoint::BindFramebufferOES, std::move(paramBuffer));
......@@ -4710,7 +4754,7 @@ CallCapture CaptureBindRenderbufferOES(const Context *context,
{
ParamBuffer paramBuffer;
paramBuffer.addValueParam("target", ParamType::TGLenum, target);
paramBuffer.addEnumParam("target", GLenumGroup::RenderbufferTarget, ParamType::TGLenum, target);
paramBuffer.addValueParam("renderbuffer", ParamType::TGLuint, renderbuffer);
return CallCapture(gl::EntryPoint::BindRenderbufferOES, std::move(paramBuffer));
......@@ -4723,7 +4767,7 @@ CallCapture CaptureCheckFramebufferStatusOES(const Context *context,
{
ParamBuffer paramBuffer;
paramBuffer.addValueParam("target", ParamType::TGLenum, target);
paramBuffer.addEnumParam("target", GLenumGroup::FramebufferTarget, ParamType::TGLenum, target);
ParamCapture returnValueCapture("returnValue", ParamType::TGLenum);
InitParamValue(ParamType::TGLenum, returnValue, &returnValueCapture.value);
......@@ -4777,9 +4821,11 @@ CallCapture CaptureFramebufferRenderbufferOES(const Context *context,
{
ParamBuffer paramBuffer;
paramBuffer.addValueParam("target", ParamType::TGLenum, target);
paramBuffer.addValueParam("attachment", ParamType::TGLenum, attachment);
paramBuffer.addValueParam("renderbuffertarget", ParamType::TGLenum, renderbuffertarget);
paramBuffer.addEnumParam("target", GLenumGroup::FramebufferTarget, ParamType::TGLenum, target);
paramBuffer.addEnumParam("attachment", GLenumGroup::FramebufferAttachment, ParamType::TGLenum,
attachment);
paramBuffer.addEnumParam("renderbuffertarget", GLenumGroup::RenderbufferTarget,
ParamType::TGLenum, renderbuffertarget);
paramBuffer.addValueParam("renderbuffer", ParamType::TGLuint, renderbuffer);
return CallCapture(gl::EntryPoint::FramebufferRenderbufferOES, std::move(paramBuffer));
......@@ -4795,8 +4841,9 @@ CallCapture CaptureFramebufferTexture2DOES(const Context *context,
{
ParamBuffer paramBuffer;
paramBuffer.addValueParam("target", ParamType::TGLenum, target);
paramBuffer.addValueParam("attachment", ParamType::TGLenum, attachment);
paramBuffer.addEnumParam("target", GLenumGroup::FramebufferTarget, ParamType::TGLenum, target);
paramBuffer.addEnumParam("attachment", GLenumGroup::FramebufferAttachment, ParamType::TGLenum,
attachment);
paramBuffer.addValueParam("textargetPacked", ParamType::TTextureTarget, textargetPacked);
paramBuffer.addValueParam("texture", ParamType::TGLuint, texture);
paramBuffer.addValueParam("level", ParamType::TGLint, level);
......@@ -4860,9 +4907,11 @@ CallCapture CaptureGetFramebufferAttachmentParameterivOES(const Context *context
{
ParamBuffer paramBuffer;
paramBuffer.addValueParam("target", ParamType::TGLenum, target);
paramBuffer.addValueParam("attachment", ParamType::TGLenum, attachment);
paramBuffer.addValueParam("pname", ParamType::TGLenum, pname);
paramBuffer.addEnumParam("target", GLenumGroup::FramebufferTarget, ParamType::TGLenum, target);
paramBuffer.addEnumParam("attachment", GLenumGroup::FramebufferAttachment, ParamType::TGLenum,
attachment);
paramBuffer.addEnumParam("pname", GLenumGroup::FramebufferAttachmentParameterName,
ParamType::TGLenum, pname);
ParamCapture paramsParam("params", ParamType::TGLintPointer);
InitParamValue(ParamType::TGLintPointer, params, &paramsParam.value);
......@@ -4882,8 +4931,9 @@ CallCapture CaptureGetRenderbufferParameterivOES(const Context *context,
{
ParamBuffer paramBuffer;
paramBuffer.addValueParam("target", ParamType::TGLenum, target);
paramBuffer.addValueParam("pname", ParamType::TGLenum, pname);
paramBuffer.addEnumParam("target", GLenumGroup::RenderbufferTarget, ParamType::TGLenum, target);
paramBuffer.addEnumParam("pname", GLenumGroup::RenderbufferParameterName, ParamType::TGLenum,
pname);
ParamCapture paramsParam("params", ParamType::TGLintPointer);
InitParamValue(ParamType::TGLintPointer, params, &paramsParam.value);
......@@ -4935,8 +4985,9 @@ CallCapture CaptureRenderbufferStorageOES(const Context *context,
{
ParamBuffer paramBuffer;
paramBuffer.addValueParam("target", ParamType::TGLenum, target);
paramBuffer.addValueParam("internalformat", ParamType::TGLenum, internalformat);
paramBuffer.addEnumParam("target", GLenumGroup::RenderbufferTarget, ParamType::TGLenum, target);
paramBuffer.addEnumParam("internalformat", GLenumGroup::InternalFormat, ParamType::TGLenum,
internalformat);
paramBuffer.addValueParam("width", ParamType::TGLsizei, width);
paramBuffer.addValueParam("height", ParamType::TGLsizei, height);
......@@ -4987,7 +5038,8 @@ CallCapture CaptureProgramBinaryOES(const Context *context,
ParamBuffer paramBuffer;
paramBuffer.addValueParam("program", ParamType::TGLuint, program);
paramBuffer.addValueParam("binaryFormat", ParamType::TGLenum, binaryFormat);
paramBuffer.addEnumParam("binaryFormat", GLenumGroup::DefaultGroup, ParamType::TGLenum,
binaryFormat);
ParamCapture binaryParam("binary", ParamType::TvoidConstPointer);
InitParamValue(ParamType::TvoidConstPointer, binary, &binaryParam.value);
......@@ -5009,7 +5061,7 @@ CallCapture CaptureGetBufferPointervOES(const Context *context,
ParamBuffer paramBuffer;
paramBuffer.addValueParam("targetPacked", ParamType::TBufferBinding, targetPacked);
paramBuffer.addValueParam("pname", ParamType::TGLenum, pname);
paramBuffer.addEnumParam("pname", GLenumGroup::DefaultGroup, ParamType::TGLenum, pname);
ParamCapture paramsParam("params", ParamType::TvoidPointerPointer);
InitParamValue(ParamType::TvoidPointerPointer, params, &paramsParam.value);
......@@ -5029,7 +5081,7 @@ CallCapture CaptureMapBufferOES(const Context *context,
ParamBuffer paramBuffer;
paramBuffer.addValueParam("targetPacked", ParamType::TBufferBinding, targetPacked);
paramBuffer.addValueParam("access", ParamType::TGLenum, access);
paramBuffer.addEnumParam("access", GLenumGroup::BufferAccessARB, ParamType::TGLenum, access);
ParamCapture returnValueCapture("returnValue", ParamType::TvoidPointer);
InitParamValue(ParamType::TvoidPointer, returnValue, &returnValueCapture.value);
......@@ -5082,7 +5134,7 @@ CallCapture CaptureMatrixIndexPointerOES(const Context *context,
ParamBuffer paramBuffer;
paramBuffer.addValueParam("size", ParamType::TGLint, size);
paramBuffer.addValueParam("type", ParamType::TGLenum, type);
paramBuffer.addEnumParam("type", GLenumGroup::DefaultGroup, ParamType::TGLenum, type);
paramBuffer.addValueParam("stride", ParamType::TGLsizei, stride);
ParamCapture pointerParam("pointer", ParamType::TvoidConstPointer);
......@@ -5104,7 +5156,7 @@ CallCapture CaptureWeightPointerOES(const Context *context,
ParamBuffer paramBuffer;
paramBuffer.addValueParam("size", ParamType::TGLint, size);
paramBuffer.addValueParam("type", ParamType::TGLenum, type);
paramBuffer.addEnumParam("type", GLenumGroup::DefaultGroup, ParamType::TGLenum, type);
paramBuffer.addValueParam("stride", ParamType::TGLsizei, stride);
ParamCapture pointerParam("pointer", ParamType::TvoidConstPointer);
......@@ -5177,7 +5229,8 @@ CallCapture CaptureCompressedTexImage3DOES(const Context *context,
paramBuffer.addValueParam("targetPacked", ParamType::TTextureTarget, targetPacked);
paramBuffer.addValueParam("level", ParamType::TGLint, level);
paramBuffer.addValueParam("internalformat", ParamType::TGLenum, internalformat);
paramBuffer.addEnumParam("internalformat", GLenumGroup::InternalFormat, ParamType::TGLenum,
internalformat);
paramBuffer.addValueParam("width", ParamType::TGLsizei, width);
paramBuffer.addValueParam("height", ParamType::TGLsizei, height);
paramBuffer.addValueParam("depth", ParamType::TGLsizei, depth);
......@@ -5217,7 +5270,7 @@ CallCapture CaptureCompressedTexSubImage3DOES(const Context *context,
paramBuffer.addValueParam("width", ParamType::TGLsizei, width);
paramBuffer.addValueParam("height", ParamType::TGLsizei, height);
paramBuffer.addValueParam("depth", ParamType::TGLsizei, depth);
paramBuffer.addValueParam("format", ParamType::TGLenum, format);
paramBuffer.addEnumParam("format", GLenumGroup::PixelFormat, ParamType::TGLenum, format);
paramBuffer.addValueParam("imageSize", ParamType::TGLsizei, imageSize);
ParamCapture dataParam("data", ParamType::TvoidConstPointer);
......@@ -5268,8 +5321,9 @@ CallCapture CaptureFramebufferTexture3DOES(const Context *context,
{
ParamBuffer paramBuffer;
paramBuffer.addValueParam("target", ParamType::TGLenum, target);
paramBuffer.addValueParam("attachment", ParamType::TGLenum, attachment);
paramBuffer.addEnumParam("target", GLenumGroup::FramebufferTarget, ParamType::TGLenum, target);
paramBuffer.addEnumParam("attachment", GLenumGroup::FramebufferAttachment, ParamType::TGLenum,
attachment);
paramBuffer.addValueParam("textargetPacked", ParamType::TTextureTarget, textargetPacked);
paramBuffer.addValueParam("texture", ParamType::TGLuint, texture);
paramBuffer.addValueParam("level", ParamType::TGLint, level);
......@@ -5295,13 +5349,14 @@ CallCapture CaptureTexImage3DOES(const Context *context,
paramBuffer.addValueParam("targetPacked", ParamType::TTextureTarget, targetPacked);
paramBuffer.addValueParam("level", ParamType::TGLint, level);
paramBuffer.addValueParam("internalformat", ParamType::TGLenum, internalformat);
paramBuffer.addEnumParam("internalformat", GLenumGroup::InternalFormat, ParamType::TGLenum,
internalformat);
paramBuffer.addValueParam("width", ParamType::TGLsizei, width);
paramBuffer.addValueParam("height", ParamType::TGLsizei, height);
paramBuffer.addValueParam("depth", ParamType::TGLsizei, depth);
paramBuffer.addValueParam("border", ParamType::TGLint, border);
paramBuffer.addValueParam("format", ParamType::TGLenum, format);
paramBuffer.addValueParam("type", ParamType::TGLenum, type);
paramBuffer.addEnumParam("format", GLenumGroup::PixelFormat, ParamType::TGLenum, format);
paramBuffer.addEnumParam("type", GLenumGroup::PixelType, ParamType::TGLenum, type);
ParamCapture pixelsParam("pixels", ParamType::TvoidConstPointer);
InitParamValue(ParamType::TvoidConstPointer, pixels, &pixelsParam.value);
......@@ -5336,8 +5391,8 @@ CallCapture CaptureTexSubImage3DOES(const Context *context,
paramBuffer.addValueParam("width", ParamType::TGLsizei, width);
paramBuffer.addValueParam("height", ParamType::TGLsizei, height);
paramBuffer.addValueParam("depth", ParamType::TGLsizei, depth);
paramBuffer.addValueParam("format", ParamType::TGLenum, format);
paramBuffer.addValueParam("type", ParamType::TGLenum, type);
paramBuffer.addEnumParam("format", GLenumGroup::PixelFormat, ParamType::TGLenum, format);
paramBuffer.addEnumParam("type", GLenumGroup::PixelType, ParamType::TGLenum, type);
ParamCapture pixelsParam("pixels", ParamType::TvoidConstPointer);
InitParamValue(ParamType::TvoidConstPointer, pixels, &pixelsParam.value);
......@@ -5358,7 +5413,7 @@ CallCapture CaptureGetSamplerParameterIivOES(const Context *context,
ParamBuffer paramBuffer;
paramBuffer.addValueParam("sampler", ParamType::TGLuint, sampler);
paramBuffer.addValueParam("pname", ParamType::TGLenum, pname);
paramBuffer.addEnumParam("pname", GLenumGroup::SamplerParameterName, ParamType::TGLenum, pname);
ParamCapture paramsParam("params", ParamType::TGLintPointer);
InitParamValue(ParamType::TGLintPointer, params, &paramsParam.value);
......@@ -5378,7 +5433,7 @@ CallCapture CaptureGetSamplerParameterIuivOES(const Context *context,
ParamBuffer paramBuffer;
paramBuffer.addValueParam("sampler", ParamType::TGLuint, sampler);
paramBuffer.addValueParam("pname", ParamType::TGLenum, pname);
paramBuffer.addEnumParam("pname", GLenumGroup::SamplerParameterName, ParamType::TGLenum, pname);
ParamCapture paramsParam("params", ParamType::TGLuintPointer);
InitParamValue(ParamType::TGLuintPointer, params, &paramsParam.value);
......@@ -5398,7 +5453,7 @@ CallCapture CaptureGetTexParameterIivOES(const Context *context,
ParamBuffer paramBuffer;
paramBuffer.addValueParam("targetPacked", ParamType::TTextureType, targetPacked);
paramBuffer.addValueParam("pname", ParamType::TGLenum, pname);
paramBuffer.addEnumParam("pname", GLenumGroup::GetTextureParameter, ParamType::TGLenum, pname);
ParamCapture paramsParam("params", ParamType::TGLintPointer);
InitParamValue(ParamType::TGLintPointer, params, &paramsParam.value);
......@@ -5418,7 +5473,7 @@ CallCapture CaptureGetTexParameterIuivOES(const Context *context,
ParamBuffer paramBuffer;
paramBuffer.addValueParam("targetPacked", ParamType::TTextureType, targetPacked);
paramBuffer.addValueParam("pname", ParamType::TGLenum, pname);
paramBuffer.addEnumParam("pname", GLenumGroup::GetTextureParameter, ParamType::TGLenum, pname);
ParamCapture paramsParam("params", ParamType::TGLuintPointer);
InitParamValue(ParamType::TGLuintPointer, params, &paramsParam.value);
......@@ -5438,7 +5493,7 @@ CallCapture CaptureSamplerParameterIivOES(const Context *context,
ParamBuffer paramBuffer;
paramBuffer.addValueParam("sampler", ParamType::TGLuint, sampler);
paramBuffer.addValueParam("pname", ParamType::TGLenum, pname);
paramBuffer.addEnumParam("pname", GLenumGroup::SamplerParameterName, ParamType::TGLenum, pname);
ParamCapture paramParam("param", ParamType::TGLintConstPointer);
InitParamValue(ParamType::TGLintConstPointer, param, &paramParam.value);
......@@ -5457,7 +5512,7 @@ CallCapture CaptureSamplerParameterIuivOES(const Context *context,
ParamBuffer paramBuffer;
paramBuffer.addValueParam("sampler", ParamType::TGLuint, sampler);
paramBuffer.addValueParam("pname", ParamType::TGLenum, pname);
paramBuffer.addEnumParam("pname", GLenumGroup::SamplerParameterName, ParamType::TGLenum, pname);
ParamCapture paramParam("param", ParamType::TGLuintConstPointer);
InitParamValue(ParamType::TGLuintConstPointer, param, &paramParam.value);
......@@ -5476,7 +5531,7 @@ CallCapture CaptureTexParameterIivOES(const Context *context,
ParamBuffer paramBuffer;
paramBuffer.addValueParam("targetPacked", ParamType::TTextureType, targetPacked);
paramBuffer.addValueParam("pname", ParamType::TGLenum, pname);
paramBuffer.addEnumParam("pname", GLenumGroup::TextureParameterName, ParamType::TGLenum, pname);
ParamCapture paramsParam("params", ParamType::TGLintConstPointer);
InitParamValue(ParamType::TGLintConstPointer, params, &paramsParam.value);
......@@ -5496,7 +5551,7 @@ CallCapture CaptureTexParameterIuivOES(const Context *context,
ParamBuffer paramBuffer;
paramBuffer.addValueParam("targetPacked", ParamType::TTextureType, targetPacked);
paramBuffer.addValueParam("pname", ParamType::TGLenum, pname);
paramBuffer.addEnumParam("pname", GLenumGroup::TextureParameterName, ParamType::TGLenum, pname);
ParamCapture paramsParam("params", ParamType::TGLuintConstPointer);
InitParamValue(ParamType::TGLuintConstPointer, params, &paramsParam.value);
......@@ -5515,8 +5570,8 @@ CallCapture CaptureGetTexGenfvOES(const Context *context,
{
ParamBuffer paramBuffer;
paramBuffer.addValueParam("coord", ParamType::TGLenum, coord);
paramBuffer.addValueParam("pname", ParamType::TGLenum, pname);
paramBuffer.addEnumParam("coord", GLenumGroup::TextureCoordName, ParamType::TGLenum, coord);
paramBuffer.addEnumParam("pname", GLenumGroup::TextureGenParameter, ParamType::TGLenum, pname);
ParamCapture paramsParam("params", ParamType::TGLfloatPointer);
InitParamValue(ParamType::TGLfloatPointer, params, &paramsParam.value);
......@@ -5534,8 +5589,8 @@ CallCapture CaptureGetTexGenivOES(const Context *context,
{
ParamBuffer paramBuffer;
paramBuffer.addValueParam("coord", ParamType::TGLenum, coord);
paramBuffer.addValueParam("pname", ParamType::TGLenum, pname);
paramBuffer.addEnumParam("coord", GLenumGroup::TextureCoordName, ParamType::TGLenum, coord);
paramBuffer.addEnumParam("pname", GLenumGroup::TextureGenParameter, ParamType::TGLenum, pname);
ParamCapture paramsParam("params", ParamType::TGLintPointer);
InitParamValue(ParamType::TGLintPointer, params, &paramsParam.value);
......@@ -5553,8 +5608,8 @@ CallCapture CaptureGetTexGenxvOES(const Context *context,
{
ParamBuffer paramBuffer;
paramBuffer.addValueParam("coord", ParamType::TGLenum, coord);
paramBuffer.addValueParam("pname", ParamType::TGLenum, pname);
paramBuffer.addEnumParam("coord", GLenumGroup::TextureCoordName, ParamType::TGLenum, coord);
paramBuffer.addEnumParam("pname", GLenumGroup::TextureGenParameter, ParamType::TGLenum, pname);
ParamCapture paramsParam("params", ParamType::TGLfixedPointer);
InitParamValue(ParamType::TGLfixedPointer, params, &paramsParam.value);
......@@ -5572,8 +5627,8 @@ CallCapture CaptureTexGenfOES(const Context *context,
{
ParamBuffer paramBuffer;
paramBuffer.addValueParam("coord", ParamType::TGLenum, coord);
paramBuffer.addValueParam("pname", ParamType::TGLenum, pname);
paramBuffer.addEnumParam("coord", GLenumGroup::TextureCoordName, ParamType::TGLenum, coord);
paramBuffer.addEnumParam("pname", GLenumGroup::TextureGenParameter, ParamType::TGLenum, pname);
paramBuffer.addValueParam("param", ParamType::TGLfloat, param);
return CallCapture(gl::EntryPoint::TexGenfOES, std::move(paramBuffer));
......@@ -5587,8 +5642,8 @@ CallCapture CaptureTexGenfvOES(const Context *context,
{
ParamBuffer paramBuffer;
paramBuffer.addValueParam("coord", ParamType::TGLenum, coord);
paramBuffer.addValueParam("pname", ParamType::TGLenum, pname);
paramBuffer.addEnumParam("coord", GLenumGroup::TextureCoordName, ParamType::TGLenum, coord);
paramBuffer.addEnumParam("pname", GLenumGroup::TextureGenParameter, ParamType::TGLenum, pname);
ParamCapture paramsParam("params", ParamType::TGLfloatConstPointer);
InitParamValue(ParamType::TGLfloatConstPointer, params, &paramsParam.value);
......@@ -5606,8 +5661,8 @@ CallCapture CaptureTexGeniOES(const Context *context,
{
ParamBuffer paramBuffer;
paramBuffer.addValueParam("coord", ParamType::TGLenum, coord);
paramBuffer.addValueParam("pname", ParamType::TGLenum, pname);
paramBuffer.addEnumParam("coord", GLenumGroup::TextureCoordName, ParamType::TGLenum, coord);
paramBuffer.addEnumParam("pname", GLenumGroup::TextureGenParameter, ParamType::TGLenum, pname);
paramBuffer.addValueParam("param", ParamType::TGLint, param);
return CallCapture(gl::EntryPoint::TexGeniOES, std::move(paramBuffer));
......@@ -5621,8 +5676,8 @@ CallCapture CaptureTexGenivOES(const Context *context,
{
ParamBuffer paramBuffer;
paramBuffer.addValueParam("coord", ParamType::TGLenum, coord);
paramBuffer.addValueParam("pname", ParamType::TGLenum, pname);
paramBuffer.addEnumParam("coord", GLenumGroup::TextureCoordName, ParamType::TGLenum, coord);
paramBuffer.addEnumParam("pname", GLenumGroup::TextureGenParameter, ParamType::TGLenum, pname);
ParamCapture paramsParam("params", ParamType::TGLintConstPointer);
InitParamValue(ParamType::TGLintConstPointer, params, &paramsParam.value);
......@@ -5640,8 +5695,8 @@ CallCapture CaptureTexGenxOES(const Context *context,
{
ParamBuffer paramBuffer;
paramBuffer.addValueParam("coord", ParamType::TGLenum, coord);
paramBuffer.addValueParam("pname", ParamType::TGLenum, pname);
paramBuffer.addEnumParam("coord", GLenumGroup::TextureCoordName, ParamType::TGLenum, coord);
paramBuffer.addEnumParam("pname", GLenumGroup::TextureGenParameter, ParamType::TGLenum, pname);
paramBuffer.addValueParam("param", ParamType::TGLfixed, param);
return CallCapture(gl::EntryPoint::TexGenxOES, std::move(paramBuffer));
......@@ -5655,8 +5710,8 @@ CallCapture CaptureTexGenxvOES(const Context *context,
{
ParamBuffer paramBuffer;
paramBuffer.addValueParam("coord", ParamType::TGLenum, coord);
paramBuffer.addValueParam("pname", ParamType::TGLenum, pname);
paramBuffer.addEnumParam("coord", GLenumGroup::TextureCoordName, ParamType::TGLenum, coord);
paramBuffer.addEnumParam("pname", GLenumGroup::TextureGenParameter, ParamType::TGLenum, pname);
ParamCapture paramsParam("params", ParamType::TGLfixedConstPointer);
InitParamValue(ParamType::TGLfixedConstPointer, params, &paramsParam.value);
......@@ -5680,7 +5735,8 @@ CallCapture CaptureTexStorage3DMultisampleOES(const Context *context,
paramBuffer.addValueParam("targetPacked", ParamType::TTextureType, targetPacked);
paramBuffer.addValueParam("samples", ParamType::TGLsizei, samples);
paramBuffer.addValueParam("internalformat", ParamType::TGLenum, internalformat);
paramBuffer.addEnumParam("internalformat", GLenumGroup::InternalFormat, ParamType::TGLenum,
internalformat);
paramBuffer.addValueParam("width", ParamType::TGLsizei, width);
paramBuffer.addValueParam("height", ParamType::TGLsizei, height);
paramBuffer.addValueParam("depth", ParamType::TGLsizei, depth);
......@@ -5759,8 +5815,9 @@ CallCapture CaptureFramebufferTextureMultiviewOVR(const Context *context,
{
ParamBuffer paramBuffer;
paramBuffer.addValueParam("target", ParamType::TGLenum, target);
paramBuffer.addValueParam("attachment", ParamType::TGLenum, attachment);
paramBuffer.addEnumParam("target", GLenumGroup::FramebufferTarget, ParamType::TGLenum, target);
paramBuffer.addEnumParam("attachment", GLenumGroup::FramebufferAttachment, ParamType::TGLenum,
attachment);
paramBuffer.addValueParam("texture", ParamType::TGLuint, texture);
paramBuffer.addValueParam("level", ParamType::TGLint, level);
paramBuffer.addValueParam("baseViewIndex", ParamType::TGLint, baseViewIndex);
......
src/libANGLE/gl_enum_utils_autogen.cpp 0 → 100644
This source diff could not be displayed because it is too large. You can view the blob instead.
src/libANGLE/gl_enum_utils_autogen.h 0 → 100644
// GENERATED FILE - DO NOT EDIT.
// Generated by gen_gl_enum_utils.py using data from gl.xml and gl_angle_ext.xml.
//
// Copyright 2019 The ANGLE Project Authors. All rights reserved.
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
//
// gl_enum_utils_autogen.h:
// mapping of GLenum value to string.
#ifndef LIBANGLE_GL_ENUM_UTILS_AUTOGEN_H_
#define LIBANGLE_GL_ENUM_UTILS_AUTOGEN_H_
#include <string>
namespace gl
{
enum class GLenumGroup
{
AccumOp,
AlphaFunction,
AtomicCounterBufferPName,
AttribMask,
AttributeType,
BindTransformFeedbackTarget,
BlendEquationModeEXT,
BlendingFactor,
BlitFramebufferFilter,
Boolean,
Buffer,
BufferAccessARB,
BufferAccessMask,
BufferBitQCOM,
BufferStorageTarget,
BufferTargetARB,
BufferUsageARB,
CheckFramebufferStatusTarget,
ClearBufferMask,
ClientAttribMask,
ClipControlDepth,
ClipControlOrigin,
ClipPlaneName,
ColorBuffer,
ColorMaterialFace,
ColorMaterialParameter,
ColorPointerType,
ColorTableParameterPNameSGI,
ColorTableTarget,
ColorTableTargetSGI,
ContextFlagMask,
ContextProfileMask,
ConvolutionBorderModeEXT,
ConvolutionParameterEXT,
ConvolutionTarget,
ConvolutionTargetEXT,
CopyBufferSubDataTarget,
CullFaceMode,
DataType,
DebugSeverity,
DebugSource,
DebugType,
DefaultGroup,
DepthFunction,
DrawBufferMode,
DrawElementsType,
EnableCap,
ErrorCode,
ExternalHandleType,
FeedBackToken,
FeedbackType,
FfdMaskSGIX,
FfdTargetSGIX,
FogCoordinatePointerType,
FogMode,
FogPName,
FogParameter,
FogPointerTypeEXT,
FogPointerTypeIBM,
FragmentLightModelParameterSGIX,
FragmentOpATI,
FramebufferAttachment,
FramebufferAttachmentParameterName,
FramebufferFetchNoncoherent,
FramebufferParameterName,
FramebufferStatus,
FramebufferTarget,
FrontFaceDirection,
GetColorTableParameterPNameSGI,
GetConvolutionParameter,
GetFramebufferParameter,
GetHistogramParameterPNameEXT,
GetMapQuery,
GetMinmaxParameterPNameEXT,
GetPName,
GetPixelMap,
GetPointervPName,
GetTextureParameter,
GraphicsResetStatus,
HintMode,
HintTarget,
HistogramTargetEXT,
IndexPointerType,
InterleavedArrayFormat,
InternalFormat,
InternalFormatPName,
LightEnvModeSGIX,
LightEnvParameterSGIX,
LightModelColorControl,
LightModelParameter,
LightName,
LightParameter,
ListMode,
ListNameType,
ListParameterName,
LogicOp,
MapBufferUsageMask,
MapQuery,
MapTarget,
MapTextureFormatINTEL,
MaterialFace,
MaterialParameter,
MatrixMode,
MemoryBarrierMask,
MemoryObjectParameterName,
MeshMode1,
MeshMode2,
MinmaxTargetEXT,
NormalPointerType,
ObjectIdentifier,
OcclusionQueryEventMaskAMD,
PatchParameterName,
PathColor,
PathCoverMode,
PathElementType,
PathFillMode,
PathFontStyle,
PathFontTarget,
PathGenMode,
PathHandleMissingGlyphs,
PathListMode,
PathMetricMask,
PathParameter,
PathStringFormat,
PathTransformType,
PipelineParameterName,
PixelCopyType,
PixelFormat,
PixelMap,
PixelStoreParameter,
PixelStoreResampleMode,
PixelStoreSubsampleRate,
PixelTexGenMode,
PixelTexGenParameterNameSGIS,
PixelTransferParameter,
PixelType,
PointParameterNameSGIS,
PolygonMode,
PrecisionType,
PrimitiveType,
ProgramInterface,
ProgramInterfacePName,
ProgramParameterPName,
ProgramPropertyARB,
ProgramStagePName,
QueryObjectParameterName,
QueryParameterName,
QueryTarget,
ReadBufferMode,
RenderbufferParameterName,
RenderbufferTarget,
RenderingMode,
SamplePatternSGIS,
SamplerParameterName,
SemaphoreParameterName,
SeparableTargetEXT,
ShaderParameterName,
ShaderType,
ShadingModel,
StencilFaceDirection,
StencilFunction,
StencilOp,
StringName,
SubroutineParameterName,
SyncCondition,
SyncObjectMask,
SyncParameterName,
SyncStatus,
TexCoordPointerType,
TextureCoordName,
TextureEnvMode,
TextureEnvParameter,
TextureEnvTarget,
TextureFilterFuncSGIS,
TextureGenMode,
TextureGenParameter,
TextureLayout,
TextureMagFilter,
TextureMinFilter,
TextureParameterName,
TextureStorageMaskAMD,
TextureTarget,
TextureUnit,
TextureWrapMode,
TransformFeedbackPName,
TypeEnum,
UniformBlockPName,
UniformPName,
UseProgramStageMask,
VertexArrayPName,
VertexAttribEnum,
VertexAttribPointerType,
VertexAttribType,
VertexBufferObjectParameter,
VertexBufferObjectUsage,
VertexPointerType,
VertexProvokingMode
};
const char *GLenumToString(GLenumGroup enumGroup, unsigned int value);
std::string GLbitfieldToString(GLenumGroup enumGroup, unsigned int value);
} // namespace gl
#endif // LIBANGLE_GL_ENUM_UTILS_AUTOGEN_H_
src/libGLESv2.gni
......@@ -920,6 +920,7 @@ libangle_sources += [
"src/libANGLE/capture_gles_3_1_autogen.h",
"src/libANGLE/capture_gles_ext_autogen.h",
"src/libANGLE/frame_capture_utils_autogen.h",
"src/libANGLE/gl_enum_utils_autogen.h",
]
libangle_capture_sources = [
......@@ -934,6 +935,7 @@ libangle_capture_sources = [
"src/libANGLE/capture_gles_3_1_params.cpp",
"src/libANGLE/capture_gles_ext_autogen.cpp",
"src/libANGLE/capture_gles_ext_params.cpp",
"src/libANGLE/gl_enum_utils_autogen.cpp",
"src/libANGLE/frame_capture_utils_autogen.cpp",
]
......
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