Move blob from compiler/ to util/

There's nothing whatsoever compiler-specific about it other than that's
currently where it's used.

Reviewed-by: Kristian H. Kristensen <hoegsberg@google.com>
Reviewed-by: Lionel Landwerlin <lionel.g.landwerlin@intel.com>
This commit is contained in:
Jason Ekstrand 2019-09-18 14:32:00 -05:00
parent fc5a87715a
commit 0c4e89ad5b
15 changed files with 24 additions and 23 deletions

View File

@ -1,6 +1,4 @@
LIBCOMPILER_FILES = \
blob.c \
blob.h \
builtin_type_macros.h \
glsl_types.cpp \
glsl_types.h \

View File

@ -18,18 +18,6 @@
# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
# SOFTWARE.
test(
'blob_test',
executable(
'blob_test',
'blob_test.c',
c_args : [c_vis_args, c_msvc_compat_args, no_override_init_args],
include_directories : [inc_common, inc_compiler],
link_with : [libglsl],
),
suite : ['compiler', 'glsl'],
)
if with_shader_cache
test(
'cache_test',

View File

@ -29,8 +29,8 @@
#include <assert.h>
#include "shader_enums.h"
#include "blob.h"
#include "c11/threads.h"
#include "util/blob.h"
#include "util/macros.h"
#ifdef __cplusplus

View File

@ -24,8 +24,6 @@ inc_glsl = include_directories('glsl')
inc_spirv = include_directories('spirv')
files_libcompiler = files(
'blob.c',
'blob.h',
'builtin_type_macros.h',
'glsl_types.cpp',
'glsl_types.h',

View File

@ -25,7 +25,7 @@
#define _NIR_SERIALIZE_H
#include "nir.h"
#include "compiler/blob.h"
#include "util/blob.h"
#ifdef __cplusplus
extern "C" {

View File

@ -31,8 +31,8 @@
#include <assert.h>
#include <string.h>
#include "compiler/blob.h"
#include "compiler/nir/nir.h"
#include "util/blob.h"
#include "util/build_id.h"
#include "util/disk_cache.h"
#include "util/mesa-sha1.h"

View File

@ -21,7 +21,7 @@
* IN THE SOFTWARE.
*/
#include "compiler/blob.h"
#include "util/blob.h"
#include "util/hash_table.h"
#include "util/debug.h"
#include "util/disk_cache.h"

View File

@ -21,10 +21,10 @@
* IN THE SOFTWARE.
*/
#include "compiler/blob.h"
#include "compiler/glsl/ir_uniform.h"
#include "compiler/glsl/shader_cache.h"
#include "main/mtypes.h"
#include "util/blob.h"
#include "util/build_id.h"
#include "util/debug.h"
#include "util/disk_cache.h"

View File

@ -29,12 +29,12 @@
*/
#include "compiler/blob.h"
#include "compiler/glsl/serialize.h"
#include "main/errors.h"
#include "main/mtypes.h"
#include "main/shaderapi.h"
#include "util/bitscan.h"
#include "util/blob.h"
#include "util/crc32.h"
#include "program_binary.h"
#include "program/prog_parameter.h"

View File

@ -25,9 +25,9 @@
#define ST_SHADER_CACHE_H
#include "st_context.h"
#include "compiler/blob.h"
#include "main/mtypes.h"
#include "pipe/p_state.h"
#include "util/blob.h"
#include "util/disk_cache.h"
#include "util/mesa-sha1.h"

View File

@ -5,6 +5,8 @@ MESA_UTIL_FILES := \
bitscan.c \
bitscan.h \
bitset.h \
blob.c \
blob.h \
build_id.c \
build_id.h \
crc32.c \

View File

@ -29,6 +29,8 @@ files_mesa_util = files(
'bitscan.c',
'bitscan.h',
'bitset.h',
'blob.c',
'blob.h',
'build_id.c',
'build_id.h',
'crc32.c',
@ -144,6 +146,7 @@ deps_for_libmesa_util = [
dep_thread,
dep_atomic,
dep_m,
dep_valgrind,
]
if with_platform_android
@ -202,6 +205,18 @@ if with_tests
suite : ['util'],
)
test(
'blob',
executable(
'blob_test',
files('blob_test.c'),
include_directories : inc_common,
dependencies : idep_mesautil,
c_args : [c_msvc_compat_args],
),
suite : ['util'],
)
test(
'roundeven',
executable(