Warning fixes

This commit is contained in:
Kevin DeKorte 2009-07-16 11:57:14 -04:00 committed by Alex Deucher
parent 0850776f1a
commit c42a616314
3 changed files with 19 additions and 16 deletions

View file

@ -52,22 +52,7 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#include "radeon_mipmap_tree.h"
#include "radeon_reg.h"
struct r600_cs_manager_legacy
{
struct radeon_cs_manager base;
struct radeon_context *ctx;
/* hack for scratch stuff */
uint32_t pending_age;
uint32_t pending_count;
};
struct r600_cs_reloc_legacy {
struct radeon_cs_reloc base;
uint32_t cindices;
uint32_t *indices;
uint32_t *reloc_indices;
struct offset_modifiers offset_mod;
};
static struct radeon_cs * r600_cs_create(struct radeon_cs_manager *csm,
uint32_t ndw)

View file

@ -118,6 +118,23 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#define R600_IT_SET_CTL_CONST 0x00006F00
#define R600_IT_SURFACE_BASE_UPDATE 0x00007300
struct r600_cs_manager_legacy
{
struct radeon_cs_manager base;
struct radeon_context *ctx;
/* hack for scratch stuff */
uint32_t pending_age;
uint32_t pending_count;
};
struct r600_cs_reloc_legacy {
struct radeon_cs_reloc base;
uint32_t cindices;
uint32_t *indices;
uint32_t *reloc_indices;
struct offset_modifiers offset_mod;
};
extern int r600_cs_write_reloc(struct radeon_cs *cs,
struct radeon_bo *bo,
uint32_t read_domain,
@ -130,6 +147,8 @@ static inline void r600_cs_write_dword(struct radeon_cs *cs, uint32_t dword)
cs->packets[cs->cdw++] = dword;
}
struct radeon_cs_manager * r600_radeon_cs_manager_legacy_ctor(struct radeon_context *ctx);
/**
* Write one dword to the command buffer.
*/

View file

@ -63,7 +63,6 @@ void r700Clear(GLcontext * ctx, GLbitfield mask)
{
return;
}
if (!context->radeon.radeonScreen->driScreen->dri2.enabled) {
LOCK_HARDWARE(&context->radeon);
UNLOCK_HARDWARE(&context->radeon);