Mesa (master): util: Move main/set to util/hash_set
Jason Ekstrand
jekstrand at kemper.freedesktop.org
Thu Jan 15 21:22:43 UTC 2015
Module: Mesa
Branch: master
Commit: 4c99e3ae78ed3524d188f00b558f803a943aaa00
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=4c99e3ae78ed3524d188f00b558f803a943aaa00
Author: Jason Ekstrand <jason.ekstrand at intel.com>
Date: Thu Jan 15 08:06:05 2015 -0800
util: Move main/set to util/hash_set
Reviewed-by: Matt Turner <mattst88 at gmail.com>
Reviewed-by: Eric Anholt <eric at anholt.net>
---
src/glsl/nir/nir.h | 2 +-
src/mesa/Makefile.sources | 2 --
src/mesa/drivers/dri/i965/intel_fbo.c | 2 +-
src/mesa/main/shared.c | 2 +-
src/mesa/main/syncobj.c | 2 +-
src/mesa/main/vdpau.c | 2 +-
src/util/Makefile.sources | 2 ++
src/{mesa/main => util}/set.c | 3 +--
src/{mesa/main => util}/set.h | 0
9 files changed, 8 insertions(+), 9 deletions(-)
diff --git a/src/glsl/nir/nir.h b/src/glsl/nir/nir.h
index 1faeb02..d5fa0e3 100644
--- a/src/glsl/nir/nir.h
+++ b/src/glsl/nir/nir.h
@@ -28,10 +28,10 @@
#pragma once
#include "util/hash_table.h"
-#include "main/set.h"
#include "../list.h"
#include "GL/gl.h" /* GLenum */
#include "util/ralloc.h"
+#include "util/set.h"
#include "main/mtypes.h"
#include "main/bitset.h"
#include "nir_types.h"
diff --git a/src/mesa/Makefile.sources b/src/mesa/Makefile.sources
index 2e321f3..a91f78c 100644
--- a/src/mesa/Makefile.sources
+++ b/src/mesa/Makefile.sources
@@ -174,8 +174,6 @@ MAIN_FILES = \
$(SRCDIR)main/samplerobj.h \
$(SRCDIR)main/scissor.c \
$(SRCDIR)main/scissor.h \
- $(SRCDIR)main/set.c \
- $(SRCDIR)main/set.h \
$(SRCDIR)main/shaderapi.c \
$(SRCDIR)main/shaderapi.h \
$(SRCDIR)main/shaderimage.c \
diff --git a/src/mesa/drivers/dri/i965/intel_fbo.c b/src/mesa/drivers/dri/i965/intel_fbo.c
index 37ac613f..77d1282 100644
--- a/src/mesa/drivers/dri/i965/intel_fbo.c
+++ b/src/mesa/drivers/dri/i965/intel_fbo.c
@@ -36,9 +36,9 @@
#include "main/context.h"
#include "main/teximage.h"
#include "main/image.h"
-#include "main/set.h"
#include "main/condrender.h"
#include "util/hash_table.h"
+#include "util/set.h"
#include "swrast/swrast.h"
#include "drivers/common/meta.h"
diff --git a/src/mesa/main/shared.c b/src/mesa/main/shared.c
index f74a823..2389c13 100644
--- a/src/mesa/main/shared.c
+++ b/src/mesa/main/shared.c
@@ -36,12 +36,12 @@
#include "program/program.h"
#include "dlist.h"
#include "samplerobj.h"
-#include "set.h"
#include "shaderapi.h"
#include "shaderobj.h"
#include "syncobj.h"
#include "util/hash_table.h"
+#include "util/set.h"
/**
* Allocate and initialize a shared context state structure.
diff --git a/src/mesa/main/syncobj.c b/src/mesa/main/syncobj.c
index 225399e..8832775 100644
--- a/src/mesa/main/syncobj.c
+++ b/src/mesa/main/syncobj.c
@@ -63,8 +63,8 @@
#include "get.h"
#include "dispatch.h"
#include "mtypes.h"
-#include "set.h"
#include "util/hash_table.h"
+#include "util/set.h"
#include "syncobj.h"
diff --git a/src/mesa/main/vdpau.c b/src/mesa/main/vdpau.c
index fd7561c..89d731b 100644
--- a/src/mesa/main/vdpau.c
+++ b/src/mesa/main/vdpau.c
@@ -33,9 +33,9 @@
#include <stdbool.h>
#include "util/hash_table.h"
+#include "util/set.h"
#include "context.h"
#include "glformats.h"
-#include "set.h"
#include "texobj.h"
#include "teximage.h"
#include "vdpau.h"
diff --git a/src/util/Makefile.sources b/src/util/Makefile.sources
index 5f87fc3..154677a 100644
--- a/src/util/Makefile.sources
+++ b/src/util/Makefile.sources
@@ -9,6 +9,8 @@ MESA_UTIL_FILES := \
register_allocate.h \
rgtc.c \
rgtc.h \
+ set.c \
+ set.h \
strtod.cpp \
strtod.h \
texcompress_rgtc_tmp.h \
diff --git a/src/mesa/main/set.c b/src/util/set.c
similarity index 99%
rename from src/mesa/main/set.c
rename to src/util/set.c
index 52c1dab..3f4a4ac 100644
--- a/src/mesa/main/set.c
+++ b/src/util/set.c
@@ -35,8 +35,8 @@
#include <stdlib.h>
#include "macros.h"
+#include "ralloc.h"
#include "set.h"
-#include "util/ralloc.h"
/*
* From Knuth -- a good choice for hash/rehash values is p, p-2 where
@@ -343,4 +343,3 @@ _mesa_set_random_entry(struct set *ht,
return NULL;
}
-
diff --git a/src/mesa/main/set.h b/src/util/set.h
similarity index 100%
rename from src/mesa/main/set.h
rename to src/util/set.h
More information about the mesa-commit
mailing list