diff options
author | marha <marha@users.sourceforge.net> | 2011-04-12 13:48:18 +0000 |
---|---|---|
committer | marha <marha@users.sourceforge.net> | 2011-04-12 13:48:18 +0000 |
commit | e2c8d047679db3bbb166d709b86e18180be6d713 (patch) | |
tree | d7468ac76dc71bb8d38c816be6db988bcbcbb863 /mesalib/src/mesa/state_tracker/st_context.c | |
parent | 57fb3f76b66c5f7a9f7bed9c42fb9fec9d56ee05 (diff) | |
parent | 7730393619080086530e24d3b594351b4114f608 (diff) | |
download | vcxsrv-e2c8d047679db3bbb166d709b86e18180be6d713.tar.gz vcxsrv-e2c8d047679db3bbb166d709b86e18180be6d713.tar.bz2 vcxsrv-e2c8d047679db3bbb166d709b86e18180be6d713.zip |
svn merge ^/branches/released .
Diffstat (limited to 'mesalib/src/mesa/state_tracker/st_context.c')
-rw-r--r-- | mesalib/src/mesa/state_tracker/st_context.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/mesalib/src/mesa/state_tracker/st_context.c b/mesalib/src/mesa/state_tracker/st_context.c index 458968486..ce5a68c0a 100644 --- a/mesalib/src/mesa/state_tracker/st_context.c +++ b/mesalib/src/mesa/state_tracker/st_context.c @@ -27,6 +27,7 @@ #include "main/imports.h"
#include "main/context.h"
+#include "main/samplerobj.h"
#include "main/shaderobj.h"
#include "program/prog_cache.h"
#include "vbo/vbo.h"
@@ -269,6 +270,7 @@ void st_destroy_context( struct st_context *st ) void st_init_driver_functions(struct dd_function_table *functions)
{
_mesa_init_shader_object_functions(functions);
+ _mesa_init_sampler_object_functions(functions);
st_init_accum_functions(functions);
st_init_blit_functions(functions);
|