Revert wrongly committed files.
git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@36244 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
@@ -134,6 +134,22 @@ init_common(int device, bool isClone)
|
|||||||
sharedCloner.Keep();
|
sharedCloner.Keep();
|
||||||
regsCloner.Keep();
|
regsCloner.Keep();
|
||||||
|
|
||||||
|
// The overlay registers, hardware status, and cursor memory share
|
||||||
|
// a single area with the shared_info
|
||||||
|
|
||||||
|
gInfo->overlay_registers = (struct overlay_registers *)
|
||||||
|
(gInfo->shared_info->graphics_memory
|
||||||
|
+ gInfo->shared_info->overlay_offset);
|
||||||
|
|
||||||
|
if (gInfo->shared_info->device_type.InGroup(INTEL_TYPE_96x)) {
|
||||||
|
// allocate some extra memory for the 3D context
|
||||||
|
if (intel_allocate_memory(INTEL_i965_3D_CONTEXT_SIZE,
|
||||||
|
B_APERTURE_NON_RESERVED, gInfo->context_base) == B_OK) {
|
||||||
|
gInfo->context_offset = gInfo->context_base
|
||||||
|
- (addr_t)gInfo->shared_info->graphics_memory;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
return B_OK;
|
return B_OK;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -21,12 +21,12 @@ void spin(bigtime_t delay);
|
|||||||
|
|
||||||
// general
|
// general
|
||||||
status_t intel_init_accelerant(int fd);
|
status_t intel_init_accelerant(int fd);
|
||||||
//ssize_t intel_accelerant_clone_info_size(void);
|
ssize_t intel_accelerant_clone_info_size(void);
|
||||||
//void intel_get_accelerant_clone_info(void *data);
|
void intel_get_accelerant_clone_info(void *data);
|
||||||
//status_t intel_clone_accelerant(void *data);
|
status_t intel_clone_accelerant(void *data);
|
||||||
void intel_uninit_accelerant(void);
|
void intel_uninit_accelerant(void);
|
||||||
//status_t intel_get_accelerant_device_info(accelerant_device_info *info);
|
status_t intel_get_accelerant_device_info(accelerant_device_info *info);
|
||||||
//sem_id intel_accelerant_retrace_semaphore(void);
|
sem_id intel_accelerant_retrace_semaphore(void);
|
||||||
|
|
||||||
// modes & constraints
|
// modes & constraints
|
||||||
uint32 intel_accelerant_mode_count(void);
|
uint32 intel_accelerant_mode_count(void);
|
||||||
|
|||||||
Reference in New Issue
Block a user