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

winsys/radeon: add R300 infix to winsys feature names

Browse Source
This commit is contained in:
Marek Olšák
2011-07-22 19:14:23 +02:00
parent 28a336dc38
commit ce9daf6f0b
6 changed files with 7 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/gallium/drivers/r300/r300_blit.c
+1 -1
View File
@@ -247,7 +247,7 @@ static void r300_clear(struct pipe_context* pipe,
if (!r300->hyperz_enabled) {
r300->hyperz_enabled =
r300->rws->cs_request_feature(r300->cs,
RADEON_FID_HYPERZ_RAM_ACCESS,
RADEON_FID_R300_HYPERZ_ACCESS,
TRUE);
if (r300->hyperz_enabled) {
/* Need to emit HyperZ buffer regs for the first time. */
src/gallium/drivers/r300/r300_context.c
+1 -1
View File
@@ -99,7 +99,7 @@ static void r300_destroy_context(struct pipe_context* context)
struct r300_context* r300 = r300_context(context);
if (r300->cs && r300->hyperz_enabled) {
r300->rws->cs_request_feature(r300->cs, RADEON_FID_HYPERZ_RAM_ACCESS, FALSE);
r300->rws->cs_request_feature(r300->cs, RADEON_FID_R300_HYPERZ_ACCESS, FALSE);
}
if (r300->blitter)
src/gallium/drivers/r300/r300_flush.c
+1 -1
View File
@@ -121,7 +121,7 @@ void r300_flush(struct pipe_context *pipe,
}
/* Release HyperZ. */
r300->rws->cs_request_feature(r300->cs, RADEON_FID_HYPERZ_RAM_ACCESS,
r300->rws->cs_request_feature(r300->cs, RADEON_FID_R300_HYPERZ_ACCESS,
FALSE);
}
r300->num_z_clears = 0;
src/gallium/targets/dri-r300/target.c
-1
View File
@@ -1,4 +1,3 @@
#include "target-helpers/inline_debug_helper.h"
#include "state_tracker/drm_driver.h"
#include "radeon/drm/radeon_drm_public.h"
src/gallium/winsys/radeon/drm/radeon_drm_winsys.c
+2 -2
View File
@@ -234,7 +234,7 @@ static boolean radeon_cs_request_feature(struct radeon_winsys_cs *rcs,
struct radeon_drm_cs *cs = radeon_drm_cs(rcs);
switch (fid) {
case RADEON_FID_HYPERZ_RAM_ACCESS:
case RADEON_FID_R300_HYPERZ_ACCESS:
if (debug_get_bool_option("RADEON_HYPERZ", FALSE)) {
return radeon_set_fd_access(cs, &cs->ws->hyperz_owner,
&cs->ws->hyperz_owner_mutex,
@@ -243,7 +243,7 @@ static boolean radeon_cs_request_feature(struct radeon_winsys_cs *rcs,
return FALSE;
}
case RADEON_FID_CMASK_RAM_ACCESS:
case RADEON_FID_R300_CMASK_ACCESS:
if (debug_get_bool_option("RADEON_CMASK", FALSE)) {
return radeon_set_fd_access(cs, &cs->ws->cmask_owner,
&cs->ws->cmask_owner_mutex,
src/gallium/winsys/radeon/drm/radeon_winsys.h
+2 -2
View File
@@ -83,8 +83,8 @@ struct radeon_info {
};
enum radeon_feature_id {
RADEON_FID_HYPERZ_RAM_ACCESS, /* ZMask + HiZ */
RADEON_FID_CMASK_RAM_ACCESS,
RADEON_FID_R300_HYPERZ_ACCESS, /* ZMask + HiZ */
RADEON_FID_R300_CMASK_ACCESS,
};
struct radeon_winsys {