KonstantinSeurer
/
mesa
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

r300g: remove r300_query.h

This commit is contained in:
Marek Olšák 2010-05-25 23:23:41 +02:00
parent d1dac36004
commit 73ee4e7eb2
4 changed files with 7 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/gallium/drivers/r300/r300_context.c
View File

@ -28,7 +28,6 @@
#include "r300_context.h"
#include "r300_emit.h"
#include "r300_query.h"
#include "r300_render.h"
#include "r300_screen.h"
#include "r300_screen_buffer.h"

8
src/gallium/drivers/r300/r300_context.h
View File

@ -441,7 +441,12 @@ struct r300_context {
uint64_t flush_counter;
};
/* Convenience cast wrapper. */
/* Convenience cast wrappers. */
static INLINE struct r300_query* r300_query(struct pipe_query* q)
{
return (struct r300_query*)q;
}
static INLINE struct r300_texture* r300_texture(struct pipe_resource* tex)
{
return (struct r300_texture*)tex;
@ -464,6 +469,7 @@ struct pipe_context* r300_create_context(struct pipe_screen* screen,
struct draw_stage* r300_draw_stage(struct r300_context* r300);
void r300_init_blit_functions(struct r300_context *r300);
void r300_init_flush_functions(struct r300_context* r300);
void r300_init_query_functions(struct r300_context* r300);
void r300_init_state_functions(struct r300_context* r300);
void r300_init_resource_functions(struct r300_context* r300);

1
src/gallium/drivers/r300/r300_query.c
View File

@ -26,7 +26,6 @@
#include "r300_context.h"
#include "r300_screen.h"
#include "r300_emit.h"
#include "r300_query.h"
#include <stdio.h>

35
src/gallium/drivers/r300/r300_query.h
View File

@ -1,35 +0,0 @@
/*
* Copyright 2009 Corbin Simpson <MostAwesomeDude@gmail.com>
*
* Permission is hereby granted, free of charge, to any person obtaining a
* copy of this software and associated documentation files (the "Software"),
* to deal in the Software without restriction, including without limitation
* on the rights to use, copy, modify, merge, publish, distribute, sub
* license, and/or sell copies of the Software, and to permit persons to whom
* the Software is furnished to do so, subject to the following conditions:
*
* The above copyright notice and this permission notice (including the next
* paragraph) shall be included in all copies or substantial portions of the
* Software.
*
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
* FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT. IN NO EVENT SHALL
* THE AUTHOR(S) AND/OR THEIR SUPPLIERS BE LIABLE FOR ANY CLAIM,
* DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR
* OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE
* USE OR OTHER DEALINGS IN THE SOFTWARE. */
#ifndef R300_QUERY_H
#define R300_QUERY_H
struct r300_context;
static INLINE struct r300_query* r300_query(struct pipe_query* q)
{
return (struct r300_query*)q;
}
void r300_init_query_functions(struct r300_context* r300);
#endif /* R300_QUERY_H */