Commit 4c99e3ae authored by Jason Ekstrand's avatar Jason Ekstrand
Browse files

util: Move main/set to util/hash_set


Reviewed-by: default avatarMatt Turner <mattst88@gmail.com>
Reviewed-by: default avatarEric Anholt <eric@anholt.net>
parent 8ed5305d
......@@ -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"
......
......@@ -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 \
......
......@@ -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"
......
......@@ -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.
......
......@@ -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"
......
......@@ -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"
......
......@@ -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 \
......
......@@ -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;
}
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