fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-06-05 04:18:16 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

radeon/r200/r300: make build again with tracker changes

Browse source
This commit is contained in:
Dave Airlie 2009-02-13 00:05:39 +10:00
parent 9314d936e8
commit d513915d27
8 changed files with 26 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
src/mesa/drivers/dri/r200/Makefile
View file

@ -14,6 +14,7 @@ endif
RADEON_COMMON_SOURCES = \
radeon_texture.c \
radeon_common_context.c \
radeon_common.c \
radeon_dma.c \
radeon_lock.c \
radeon_bo_legacy.c \

1
src/mesa/drivers/dri/r300/Makefile
View file

@ -23,6 +23,7 @@ COMMON_SOURCES = \
RADEON_COMMON_SOURCES = \
radeon_texture.c \
radeon_common_context.c \
radeon_common.c \
radeon_dma.c \
radeon_lock.c \
radeon_bo_legacy.c \

1
src/mesa/drivers/dri/radeon/Makefile
View file

@ -11,6 +11,7 @@ MINIGLX_SOURCES = server/radeon_dri.c
RADEON_COMMON_SOURCES = \
radeon_texture.c \
radeon_common_context.c \
radeon_common.c \
radeon_dma.c \
radeon_lock.c \
radeon_bo_legacy.c \

5
src/mesa/drivers/dri/radeon/radeon_bo_drm.h
View file

@ -32,7 +32,7 @@
#include <stdio.h>
#include <stdint.h>
#include "radeon_track.h"
//#include "radeon_track.h"
/* bo object */
#define RADEON_BO_FLAGS_MACRO_TILE 1
@ -73,7 +73,10 @@ struct radeon_bo_funcs {
struct radeon_bo_manager {
struct radeon_bo_funcs *funcs;
int fd;
#ifdef RADEON_BO_TRACK
struct radeon_tracker tracker;
#endif
};
static inline void _radeon_bo_debug(struct radeon_bo *bo,

11
src/mesa/drivers/dri/radeon/radeon_bocs_wrapper.h
View file

@ -26,7 +26,18 @@ static inline void radeon_bo_manager_gem_dtor(void *dummy)
{
}
static inline void *radeon_cs_manager_gem_ctor(int fd)
{
return NULL;
}
static inline void radeon_cs_manager_gem_dtor(void *dummy)
{
}
static inline void radeon_tracker_print(void *ptr, int io)
{
}
#endif
#include "radeon_bo_legacy.h"

1
src/mesa/drivers/dri/radeon/radeon_common.c
View file

@ -64,6 +64,7 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#include "radeon_common.h"
#include "radeon_bocs_wrapper.h"
#include "radeon_lock.h"
#include "radeon_drm.h"
#include "radeon_mipmap_tree.h"

5
src/mesa/drivers/dri/radeon/radeon_common_context.c
View file

@ -37,6 +37,7 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#include "utils.h"
#include "drirenderbuffer.h"
#include "vblank.h"
#include "main/state.h"
#define DRIVER_DATE "20090101"
@ -175,7 +176,9 @@ GLboolean radeonInitContext(radeonContextPtr radeon,
*/
void radeonCleanupContext(radeonContextPtr radeon)
{
#ifdef RADEON_BO_TRACK
FILE *track;
#endif
struct radeon_renderbuffer *rb;
GLframebuffer *fb;
@ -232,11 +235,13 @@ void radeonCleanupContext(radeonContextPtr radeon)
FREE(radeon->state.scissor.pClipRects);
radeon->state.scissor.pClipRects = 0;
}
#ifdef RADEON_BO_TRACK
track = fopen("/tmp/tracklog", "w");
if (track) {
radeon_tracker_print(&radeon->radeonScreen->bom->tracker, track);
fclose(track);
}
#endif
}
/* Force the context `c' to be unbound from its buffer.

2
src/mesa/drivers/dri/radeon/radeon_screen.c
View file

@ -1115,7 +1115,9 @@ radeonDestroyScreen( __DRIscreenPrivate *sPriv )
return;
if (screen->kernel_mm) {
#ifdef RADEON_BO_TRACK
radeon_tracker_print(&screen->bom->tracker, stderr);
#endif
radeon_bo_manager_gem_dtor(screen->bom);
} else {
radeon_bo_manager_legacy_dtor(screen->bom);