ir_deserializer fills existing gl_shader structure's ir exec_list from binary data, this will be used by shader binary cache implementation.
Signed-off-by: Tapani Pälli <tapani.pa...@intel.com> --- src/glsl/Makefile.sources | 1 + src/glsl/ir_deserializer.cpp | 730 +++++++++++++++++++++++++++++++++++++++++++ src/glsl/ir_deserializer.h | 121 +++++++ 3 files changed, 852 insertions(+) create mode 100644 src/glsl/ir_deserializer.cpp create mode 100644 src/glsl/ir_deserializer.h diff --git a/src/glsl/Makefile.sources b/src/glsl/Makefile.sources index fe93e91..06e0ae5 100644 --- a/src/glsl/Makefile.sources +++ b/src/glsl/Makefile.sources @@ -33,6 +33,7 @@ LIBGLSL_FILES = \ $(GLSL_SRCDIR)/ir_clone.cpp \ $(GLSL_SRCDIR)/ir_constant_expression.cpp \ $(GLSL_SRCDIR)/ir.cpp \ + $(GLSL_SRCDIR)/ir_deserializer.cpp \ $(GLSL_SRCDIR)/ir_equals.cpp \ $(GLSL_SRCDIR)/ir_expression_flattening.cpp \ $(GLSL_SRCDIR)/ir_function_can_inline.cpp \ diff --git a/src/glsl/ir_deserializer.cpp b/src/glsl/ir_deserializer.cpp new file mode 100644 index 0000000..21b3db8 --- /dev/null +++ b/src/glsl/ir_deserializer.cpp @@ -0,0 +1,730 @@ +/* -*- c++ -*- */ +/* + * Copyright © 2013 Intel Corporation + * + * Permission is hereby granted, free of charge, to any person obtaining a + * copy of this software and associated documentation files (the "Software"), + * to deal in the Software without restriction, including without limitation + * the rights to use, copy, modify, merge, publish, distribute, sublicense, + * and/or sell copies of the Software, and to permit persons to whom the + * Software is furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice (including the next + * paragraph) shall be included in all copies or substantial portions of the + * Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL + * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING + * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER + * DEALINGS IN THE SOFTWARE. + */ + +#include "ir_deserializer.h" + +/** + * Searches for ir_function with matching signature from exec_list. + */ +static ir_function * +search_func(struct _mesa_glsl_parse_state *state, struct exec_list *list, + const char *name, struct exec_list *parameters) +{ + foreach_list_safe(node, list) { + ir_function *func = ((ir_instruction *) node)->as_function(); + if (func && strcmp(name, func->name) == 0 && + func->matching_signature(state, parameters)) + return func; + } + return NULL; +} + + +/** + * Helper function to read a list of instructions. + */ +bool +ir_deserializer::deserialize_list(exec_list *list) +{ + uint32_t list_len = map->read_uint32_t(); + for (unsigned k = 0; k < list_len; k++) + if (!read_instruction(list)) + return false; + return true; +} + + +ir_instruction * +ir_deserializer::read_ir_variable() +{ + const glsl_type *type = deserialize_glsl_type(map, state, type_ht); + + char *name = map->read_string(); + int64_t unique_id = map->read_int64_t(); + uint8_t mode = map->read_uint8_t(); + + ir_variable *var = + new(mem_ctx) ir_variable(type, name, (ir_variable_mode) mode); + + if (!var) + return NULL; + + map->read(&var->data, sizeof(var->data)); + + var->num_state_slots = map->read_uint32_t(); + uint8_t has_constant_value = map->read_uint8_t(); + uint8_t has_constant_initializer = map->read_uint8_t(); + + var->state_slots = NULL; + + if (var->num_state_slots > 0) { + + /* Validate num_state_slots against defined maximum. */ + if (var->num_state_slots > MAX_NUM_STATE_SLOTS) + return NULL; + + var->state_slots = ralloc_array(var, ir_state_slot, var->num_state_slots); + + for (unsigned i = 0; i < var->num_state_slots; i++) { + var->state_slots[i].swizzle = map->read_int32_t(); + for (int j = 0; j < 5; j++) { + var->state_slots[i].tokens[j] = map->read_int32_t(); + } + } + } + + if (has_constant_value) + var->constant_value = read_ir_constant(); + + if (has_constant_initializer) + var->constant_initializer = read_ir_constant(); + + uint8_t has_interface_type = map->read_uint8_t(); + + if (has_interface_type) + var->init_interface_type(deserialize_glsl_type(map, state, type_ht)); + /** + * Store address to this variable so that variable + * dereference readers can find it later. + */ + _mesa_hash_table_insert(var_ht, hash_value, + (void*) (intptr_t) unique_id, var); + return var; +} + + +ir_instruction * +ir_deserializer::read_ir_function(bool prototypes_only) +{ + char *name = map->read_string(); + uint32_t num_signatures = map->read_uint32_t(); + + ir_function *f = new(mem_ctx) ir_function(name); + ir_function_signature *sig = NULL; + + /* Add all signatures to the function. */ + for (unsigned j = 0; j < num_signatures; j++) { + + /* Type equals ir_function_signature. */ + uint8_t ir_type = map->read_uint8_t(); + uint32_t len = map->read_uint32_t(); + + /* Used for debugging. */ + (void) ir_type; + (void) len; + + assert(ir_type == ir_type_function_signature); + + uint8_t is_builtin = map->read_uint8_t(); + + const glsl_type *return_type = deserialize_glsl_type(map, state, type_ht); + if (!return_type) + return NULL; + + sig = new(mem_ctx) ir_function_signature(return_type); + + /* Fill function signature parameters. */ + if (!deserialize_list(&sig->parameters)) + return NULL; + + /* Fill instructions for the function body. */ + if (!prototypes_only) { + uint32_t body_count = map->read_uint32_t(); + for (unsigned k = 0; k < body_count; k++) + if (!read_instruction(&sig->body, is_builtin ? true : false)) + return NULL; + sig->is_defined = body_count ? 1 : 0; + } + + if (!is_builtin) { + f->add_signature(sig); + } else { + ir_function_signature *builtin_sig = + _mesa_glsl_find_builtin_function(state, name, &sig->parameters); + + if (!builtin_sig) + return NULL; + + f->add_signature(sig); + } + + /* Break out of the loop if read errors occured. */ + if (map->errors()) + return NULL; + + } /* For each function signature. */ + + return f; +} + + +/* Reads in type and package length, compares type to expected type. */ +#define VALIDATE_RVALUE(node_type)\ + uint8_t ir_type = map->read_uint8_t();\ + uint32_t len = map->read_uint32_t();\ + (void) len;\ + if (ir_type != node_type)\ + return NULL;\ + + +ir_dereference_array * +ir_deserializer::read_ir_dereference_array() +{ + VALIDATE_RVALUE(ir_type_dereference_array); + + ir_rvalue *array_rval = read_ir_rvalue(); + ir_rvalue *index_rval = read_ir_rvalue(); + + if (array_rval && index_rval) + return new(mem_ctx) ir_dereference_array(array_rval, index_rval); + + return NULL; +} + + +ir_dereference_record * +ir_deserializer::read_ir_dereference_record() +{ + VALIDATE_RVALUE(ir_type_dereference_record); + + char *name = map->read_string(); + + ir_rvalue *rval = read_ir_rvalue(); + + if (rval) + return new(mem_ctx) ir_dereference_record(rval, name); + + return NULL; +} + + +/** + * Reads in a variable deref, seeks variable address + * from a map with it's unique_id. + */ +ir_dereference_variable * +ir_deserializer::read_ir_dereference_variable() +{ + VALIDATE_RVALUE(ir_type_dereference_variable); + + int64_t unique_id = map->read_int64_t(); + + hash_entry *entry = _mesa_hash_table_search(var_ht, hash_value, + (void*) (intptr_t) unique_id); + if (!entry) + return NULL; + + return new(mem_ctx) ir_dereference_variable((ir_variable*) entry->data); +} + + +ir_constant * +ir_deserializer::read_ir_constant() +{ + VALIDATE_RVALUE(ir_type_constant); + + const glsl_type *constant_type = deserialize_glsl_type(map, state, type_ht); + + ir_constant_data data; + map->read(&data, sizeof(data)); + + /* Array of constants. */ + if (constant_type->base_type == GLSL_TYPE_ARRAY) { + + struct exec_list elements; + for (unsigned i = 0; i < constant_type->length; i++) { + + ir_constant *con = read_ir_constant(); + + /* Break out of the loop if read errors occured. */ + if (map->errors()) + return NULL; + + elements.push_tail(con); + } + + return new(mem_ctx) ir_constant(constant_type, &elements); + + } else if (constant_type->base_type == GLSL_TYPE_STRUCT) { + struct exec_list elements; + if (!deserialize_list(&elements)) + return NULL; + + return new(mem_ctx) ir_constant(constant_type, &elements); + } + + return new(mem_ctx) ir_constant(constant_type, &data); +} + + +ir_swizzle * +ir_deserializer::read_ir_swizzle() +{ + VALIDATE_RVALUE(ir_type_swizzle); + + struct ir_swizzle_mask mask; + map->read(&mask, sizeof(ir_swizzle_mask)); + + ir_rvalue *rval = read_ir_rvalue(); + if (rval) + return new(mem_ctx) ir_swizzle(rval, mask.x, mask.y, mask.z, mask.w, + mask.num_components); + return NULL; +} + + +ir_texture * +ir_deserializer::read_ir_texture() +{ + VALIDATE_RVALUE(ir_type_texture); + + int32_t op = map->read_int32_t(); + + ir_texture *new_tex = new(mem_ctx) ir_texture((ir_texture_opcode) op); + + if (!new_tex) + return NULL; + + const glsl_type *type = deserialize_glsl_type(map, state, type_ht); + + ir_dereference *sampler = (ir_dereference *) read_ir_rvalue(); + + if (!sampler || !type) + return NULL; + + new_tex->set_sampler(sampler, type); + + new_tex->coordinate = read_ir_rvalue(); + new_tex->projector = read_ir_rvalue(); + new_tex->shadow_comparitor = read_ir_rvalue(); + new_tex->offset = read_ir_rvalue(); + + memset(&new_tex->lod_info, 0, sizeof(ir_texture::lod_info)); + + new_tex->lod_info.lod = read_ir_rvalue(); + new_tex->lod_info.bias = read_ir_rvalue(); + new_tex->lod_info.sample_index = read_ir_rvalue(); + new_tex->lod_info.component = read_ir_rvalue(); + new_tex->lod_info.grad.dPdx = read_ir_rvalue(); + new_tex->lod_info.grad.dPdy = read_ir_rvalue(); + + return new_tex; +} + + +ir_expression * +ir_deserializer::read_ir_expression() +{ + VALIDATE_RVALUE(ir_type_expression); + + /* Type resulting from the operation. */ + const glsl_type *rval_type = deserialize_glsl_type(map, state, type_ht); + + /* Read operation type + all operands for creating ir_expression. */ + uint32_t operation = map->read_uint32_t(); + uint32_t operands = map->read_int32_t(); + + ir_rvalue *ir_rvalue_table[4] = { NULL }; + for (unsigned k = 0; k < operands; k++) { + ir_rvalue_table[k] = read_ir_rvalue(); + if (!ir_rvalue_table[k]) + return NULL; + } + + return new(mem_ctx) ir_expression(operation, + rval_type, + ir_rvalue_table[0], + ir_rvalue_table[1], + ir_rvalue_table[2], + ir_rvalue_table[3]); +} + + +ir_rvalue * +ir_deserializer::read_ir_rvalue() +{ + uint8_t ir_type = map->read_uint8_t(); + + switch(ir_type) { + case ir_type_constant: + return read_ir_constant(); + case ir_type_dereference_variable: + return read_ir_dereference_variable(); + case ir_type_dereference_record: + return read_ir_dereference_record(); + case ir_type_dereference_array: + return read_ir_dereference_array(); + case ir_type_expression: + return read_ir_expression(); + case ir_type_swizzle: + return read_ir_swizzle(); + case ir_type_texture: + return read_ir_texture(); + /* type is ir_type_unset ir rvalue is set to NULL */ + case ir_type_unset: + default: + return NULL; + } +} + + +ir_instruction * +ir_deserializer::read_ir_assignment() +{ + uint32_t write_mask = map->read_uint8_t(); + + ir_dereference *lhs_deref = (ir_dereference *) read_ir_rvalue(); + + if (!lhs_deref) + return NULL; + + ir_rvalue *cond = read_ir_rvalue(); + ir_rvalue *rval = read_ir_rvalue(); + + if (rval) + return new(mem_ctx) ir_assignment(lhs_deref, rval, cond, write_mask); + + return NULL; +} + + +ir_instruction * +ir_deserializer::read_ir_if() +{ + ir_rvalue *cond = read_ir_rvalue(); + ir_if *irif = new(mem_ctx) ir_if(cond); + + if (!irif) + return NULL; + + if (!deserialize_list(&irif->then_instructions)) + return NULL; + if (!deserialize_list(&irif->else_instructions)) + return NULL; + + return irif; +} + + +ir_instruction * +ir_deserializer::read_ir_return() +{ + return new(mem_ctx) ir_return(read_ir_rvalue()); +} + + +/** + * Read a call to ir_function, finds the correct function + * signature from prototypes list and creates the call. + */ +ir_instruction * +ir_deserializer::read_ir_call() +{ + struct exec_list parameters; + + char *name = map->read_string(); + + ir_dereference_variable *return_deref = read_ir_dereference_variable(); + + uint8_t list_len = map->read_uint8_t(); + + /* read call parameters */ + for (unsigned k = 0; k < list_len; k++) { + ir_rvalue *rval = read_ir_rvalue(); + + if (!rval) + return NULL; + + parameters.push_tail(rval); + } + + uint8_t use_builtin = map->read_uint8_t(); + + if (use_builtin) { + ir_function_signature *builtin_sig = + _mesa_glsl_find_builtin_function(state, name, ¶meters); + + if (!builtin_sig) + return NULL; + + ir_call *call = new(mem_ctx) ir_call(builtin_sig, return_deref, + ¶meters); + call->use_builtin = true; + return call; + } + + /* Find the function from the prototypes. */ + ir_function *func = search_func(state, prototypes, name, ¶meters); + if (func) + return new(mem_ctx) ir_call(func->matching_signature(state, ¶meters), + return_deref, ¶meters); + + return NULL; +} + + +ir_instruction * +ir_deserializer::read_ir_discard() +{ + return new(mem_ctx) ir_discard(read_ir_rvalue()); +} + + +ir_instruction * +ir_deserializer::read_ir_loop() +{ + ir_loop *loop = new(mem_ctx) ir_loop; + + if (!deserialize_list(&loop->body_instructions)) + return NULL; + + return loop; +} + + +ir_instruction * +ir_deserializer::read_ir_loop_jump() +{ + uint8_t mode = map->read_uint8_t(); + return new(mem_ctx) ir_loop_jump((ir_loop_jump::jump_mode) mode); +} + + +ir_instruction * +ir_deserializer::read_emit_vertex() +{ + return new(mem_ctx) ir_emit_vertex; +} + + +ir_instruction * +ir_deserializer::read_end_primitive() +{ + return new(mem_ctx) ir_end_primitive; +} + + +bool +ir_deserializer::read_instruction(struct exec_list *list, bool ignore) +{ + uint8_t ir_type = map->read_uint8_t(); + uint32_t inst_dumpsize = map->read_uint32_t(); + + /* Reader wants to jump over this instruction. */ + if (ignore) { + map->ffwd(inst_dumpsize); + return true; + } + + ir_instruction *ir; + + switch(ir_type) { + case ir_type_variable: + ir = read_ir_variable(); + break; + case ir_type_assignment: + ir = read_ir_assignment(); + break; + case ir_type_constant: + ir = read_ir_constant(); + break; + case ir_type_function: + ir = read_ir_function(); + break; + case ir_type_if: + ir = read_ir_if(); + break; + case ir_type_return: + ir = read_ir_return(); + break; + case ir_type_call: + ir = read_ir_call(); + break; + case ir_type_discard: + ir = read_ir_discard(); + break; + case ir_type_loop: + ir = read_ir_loop(); + break; + case ir_type_loop_jump: + ir = read_ir_loop_jump(); + break; + case ir_type_emit_vertex: + ir = read_emit_vertex(); + break; + case ir_type_end_primitive: + ir = read_end_primitive(); + break; + default: + if (ir_type <= ir_type_unset || ir_type >= ir_type_max) + assert(!"read invalid ir_type during IR deserialization\n"); + + return false; + } + + if (!ir || map->errors()) + return false; + + list->push_tail(ir); + return true; +} + + +/** + * Go through the blob and read prototypes for the functions. + */ +bool +ir_deserializer::read_prototypes(unsigned list_len) +{ + uint32_t ir_start = map->position(); + + for (unsigned k = 0; k < list_len; k++) { + uint8_t ir_type = map->read_uint8_t(); + uint32_t len = map->read_uint32_t(); + + if (ir_type != ir_type_function) { + map->ffwd(len); + continue; + } + + ir_instruction *func = read_ir_function(true); + if (!func) + return false; + + prototypes->push_tail(func); + + /* Break out of the loop if read errors occured. */ + if (map->errors()) + return false; + } + + map->jump(ir_start); + return true; +} + + +/** + * Enable all glsl extensions for the parse state. Patch to pack + * enable bits in a struct was not accepted by upstream so we need + * to enable each individual bit like this. + */ +static void +enable_glsl_extensions(struct _mesa_glsl_parse_state *state) +{ + state->ARB_arrays_of_arrays_enable = true; + state->ARB_compute_shader_enable = true; + state->ARB_conservative_depth_enable = true; + state->ARB_draw_buffers_enable = true; + state->ARB_draw_instanced_enable = true; + state->ARB_explicit_attrib_location_enable = true; + state->ARB_fragment_coord_conventions_enable = true; + state->ARB_gpu_shader5_enable = true; + state->ARB_sample_shading_enable = true; + state->ARB_separate_shader_objects_enable = true; + state->ARB_shader_atomic_counters_enable = true; + state->ARB_shader_bit_encoding_enable = true; + state->ARB_shader_image_load_store_enable = true; + state->ARB_shader_stencil_export_enable = true; + state->ARB_shader_texture_lod_enable = true; + state->ARB_shading_language_420pack_enable = true; + state->ARB_shading_language_packing_enable = true; + state->ARB_texture_cube_map_array_enable = true; + state->ARB_texture_gather_enable = true; + state->ARB_texture_multisample_enable = true; + state->ARB_texture_query_levels_enable = true; + state->ARB_texture_query_lod_enable = true; + state->ARB_texture_rectangle_enable = true; + state->ARB_uniform_buffer_object_enable = true; + state->ARB_viewport_array_enable = true; + + state->OES_EGL_image_external_enable = true; + state->OES_standard_derivatives_enable = true; + state->OES_texture_3D_enable = true; + + state->AMD_conservative_depth_enable = true; + state->AMD_shader_stencil_export_enable = true; + state->AMD_shader_trinary_minmax_enable = true; + state->AMD_vertex_shader_layer_enable = true; + state->EXT_separate_shader_objects_enable = true; + state->EXT_shader_integer_mix_enable = true; + state->EXT_texture_array_enable = true; +} + + +bool +ir_deserializer::deserialize(void *mem_ctx, gl_shader *shader, memory_map *map) +{ + bool success = false; + uint32_t exec_list_len; + GET_CURRENT_CONTEXT(ctx); + + /* Allocations use passed ralloc ctx during reading. */ + this->mem_ctx = mem_ctx; + this->map = map; + + /* Parse state is used to find builtin functions and existing types during + * reading. We enable all the extensions to have all possible builtin types + * and functions available. + */ + state = new(mem_ctx) + _mesa_glsl_parse_state(ctx, + _mesa_shader_enum_to_shader_stage(shader->Type), + shader); + + enable_glsl_extensions(state); + + state->language_version = shader->Version; + state->uses_builtin_functions = true; + _mesa_glsl_initialize_builtin_functions(); + _mesa_glsl_initialize_types(state); + + prototypes = new(mem_ctx) exec_list; + shader->ir = new(shader) exec_list; + + exec_list_len = map->read_uint32_t(); + + success = read_prototypes(exec_list_len); + + /* Top level exec_list read loop, constructs a new list. */ + while(exec_list_len && success == true) { + success = read_instruction(shader->ir); + exec_list_len--; + } + + ralloc_free(prototypes); + ralloc_free(state); + + if (!success) + goto error_deserialize; + + shader->CompileStatus = GL_TRUE; + + /* Allocates glsl_symbol_table internally. */ + populate_symbol_table(shader); + + validate_ir_tree(shader->ir); + +error_deserialize: + return success; +} diff --git a/src/glsl/ir_deserializer.h b/src/glsl/ir_deserializer.h new file mode 100644 index 0000000..58a8047 --- /dev/null +++ b/src/glsl/ir_deserializer.h @@ -0,0 +1,121 @@ +/* -*- c++ -*- */ +/* + * Copyright © 2013 Intel Corporation + * + * Permission is hereby granted, free of charge, to any person obtaining a + * copy of this software and associated documentation files (the "Software"), + * to deal in the Software without restriction, including without limitation + * the rights to use, copy, modify, merge, publish, distribute, sublicense, + * and/or sell copies of the Software, and to permit persons to whom the + * Software is furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice (including the next + * paragraph) shall be included in all copies or substantial portions of the + * Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL + * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING + * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER + * DEALINGS IN THE SOFTWARE. + */ + +#pragma once +#ifndef IR_CACHE_DESERIALIZER_H +#define IR_CACHE_DESERIALIZER_H + +#include "program/program.h" +#include "glsl_parser_extras.h" +#include "main/shaderobj.h" +#include "linker.h" +#include "memory_map.h" + +#ifdef __cplusplus + +/** + * Class to deserialize gl_shader IR from a binary data blob + * + * Deserialization is done with a help of memory_map class that takes care + * of actual data reading. Class fills existing gl_shader's ir exec_list + * with IR instructions from the binary blob. + */ +class ir_deserializer +{ +public: + ir_deserializer() : + state(NULL), + mem_ctx(NULL), + map(NULL) + { + var_ht = _mesa_hash_table_create(0, int_equal); + type_ht = _mesa_hash_table_create(0, int_equal); + hash_value = _mesa_hash_data(this, sizeof(ir_deserializer)); + } + + ~ir_deserializer() + { + _mesa_hash_table_destroy(var_ht, NULL); + _mesa_hash_table_destroy(type_ht, NULL); + } + + /* deserialize IR to gl_shader from mapped memory */ + bool deserialize(void *mem_ctx, gl_shader *shader, memory_map *map); + +private: + + struct _mesa_glsl_parse_state *state; + void *mem_ctx; + memory_map *map; + + /* pointer to list which contains prototypes of functions */ + struct exec_list *prototypes; + + bool read_prototypes(unsigned list_len); + bool read_instruction(struct exec_list *list, bool ignore = false); + bool deserialize_list(struct exec_list *list); + + ir_instruction *read_ir_variable(); + ir_instruction *read_ir_assignment(); + ir_instruction *read_ir_function(bool prototypes_only = false); + ir_instruction *read_ir_if(); + ir_instruction *read_ir_return(); + ir_instruction *read_ir_call(); + ir_instruction *read_ir_discard(); + ir_instruction *read_ir_loop(); + ir_instruction *read_ir_loop_jump(); + ir_instruction *read_emit_vertex(); + ir_instruction *read_end_primitive(); + + /* rvalue readers */ + ir_rvalue *read_ir_rvalue(); + ir_constant *read_ir_constant(); + ir_swizzle *read_ir_swizzle(); + ir_texture *read_ir_texture(); + ir_expression *read_ir_expression(); + ir_dereference_array *read_ir_dereference_array(); + ir_dereference_record *read_ir_dereference_record(); + ir_dereference_variable *read_ir_dereference_variable(); + + /** + * var_ht is used to store created ir_variables with a unique_key for + * each so that ir_dereference_variable creation can find the variable + */ + struct hash_table *var_ht; + uint32_t hash_value; + + /* to read user types only once */ + struct hash_table *type_ht; + + static bool int_equal(const void *a, const void *b) + { + return a == b; + } + +}; + + +#endif /* ifdef __cplusplus */ + +#endif /* IR_CACHE_DESERIALIZER_H */ -- 1.8.3.1 _______________________________________________ mesa-dev mailing list mesa-dev@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/mesa-dev