glsl: Split out shader program serialization

This will allow us to use the program serialization to implement
ARB_get_program_binary.

Signed-off-by: Jordan Justen <jordan.l.justen@intel.com>
Reviewed-by: Timothy Arceri <tarceri@itsqueeze.com>
This commit is contained in:
Jordan Justen
2017-10-27 01:04:53 -07:00
committed by Timothy Arceri
parent 219628c118
commit ebd9e789c4
6 changed files with 1297 additions and 1181 deletions

View File

@@ -140,6 +140,8 @@ LIBGLSL_FILES = \
glsl/propagate_invariance.cpp \ glsl/propagate_invariance.cpp \
glsl/s_expression.cpp \ glsl/s_expression.cpp \
glsl/s_expression.h \ glsl/s_expression.h \
glsl/serialize.cpp \
glsl/serialize.h \
glsl/string_to_uint_map.cpp \ glsl/string_to_uint_map.cpp \
glsl/string_to_uint_map.h glsl/string_to_uint_map.h

View File

@@ -181,6 +181,8 @@ files_libglsl = files(
's_expression.h', 's_expression.h',
'string_to_uint_map.cpp', 'string_to_uint_map.cpp',
'string_to_uint_map.h', 'string_to_uint_map.h',
'serialize.cpp',
'serialize.h',
'shader_cache.cpp', 'shader_cache.cpp',
'shader_cache.h', 'shader_cache.h',
) )

File diff suppressed because it is too large Load Diff

View File

@@ -0,0 +1,50 @@
/*
* Copyright (c) 2017 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.
*/
#ifndef GLSL_SERIALIZE
#define GLSL_SERIALIZE
#include <stdbool.h>
struct blob;
struct blob_reader;
struct gl_context;
struct gl_shader_program;
#ifdef __cplusplus
extern "C" {
#endif
void
serialize_glsl_program(struct blob *blob, struct gl_context *ctx,
struct gl_shader_program *prog);
bool
deserialize_glsl_program(struct blob_reader *blob, struct gl_context *ctx,
struct gl_shader_program *prog);
#ifdef __cplusplus
} /* extern "C" */
#endif
#endif /* GLSL_SERIALIZE */

File diff suppressed because it is too large Load Diff

View File

@@ -26,6 +26,7 @@
#define SHADER_INFO_H #define SHADER_INFO_H
#include "shader_enums.h" #include "shader_enums.h"
#include <stdint.h>
#ifdef __cplusplus #ifdef __cplusplus
extern "C" { extern "C" {