summaryrefslogtreecommitdiff
path: root/src/mesa/pipe/softpipe/sp_state_sampler.c
diff options
context:
space:
mode:
authorMichal Krol <michal@tungstengraphics.com>2007-10-29 16:20:45 +0000
committerMichal Krol <michal@tungstengraphics.com>2007-10-29 17:05:38 +0000
commitee295fccdd0c94cb6b8af4dfb30283e39f548223 (patch)
treefe8f5064ad57c5dc12163efb5a91206b1e068141 /src/mesa/pipe/softpipe/sp_state_sampler.c
parentd37eb130c090abc413a54e57e0d3800ac4cd59f4 (diff)
Make gallium compile in win32.
Use FREE, MALLOC, CALLOC, GETENV wrappers. Silence compiler warnings. Add proper copyrights.
Diffstat (limited to 'src/mesa/pipe/softpipe/sp_state_sampler.c')
-rw-r--r--src/mesa/pipe/softpipe/sp_state_sampler.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/mesa/pipe/softpipe/sp_state_sampler.c b/src/mesa/pipe/softpipe/sp_state_sampler.c
index e70eabd578..7b528fbaf3 100644
--- a/src/mesa/pipe/softpipe/sp_state_sampler.c
+++ b/src/mesa/pipe/softpipe/sp_state_sampler.c
@@ -38,7 +38,7 @@ void *
softpipe_create_sampler_state(struct pipe_context *pipe,
const struct pipe_sampler_state *sampler)
{
- struct pipe_sampler_state *state = malloc(sizeof(struct pipe_sampler_state));
+ struct pipe_sampler_state *state = MALLOC( sizeof(struct pipe_sampler_state) );
memcpy(state, sampler, sizeof(struct pipe_sampler_state));
return state;
}
@@ -60,7 +60,7 @@ void
softpipe_delete_sampler_state(struct pipe_context *pipe,
void *sampler)
{
- free(sampler);
+ FREE( sampler );
}