P4 to Git Change 1161664 by rili@rili_opencl_stg on 2015/06/15 18:01:53
EPR #421679 - remove all source code related to open video Affected files ... ... //depot/stg/opencl/drivers/opencl/api/opencl/OpenVideo/Makefile#3 delete ... //depot/stg/opencl/drivers/opencl/api/opencl/OpenVideo/OVDecode.cpp#15 delete ... //depot/stg/opencl/drivers/opencl/api/opencl/OpenVideo/OVDecode.def#5 delete ... //depot/stg/opencl/drivers/opencl/api/opencl/OpenVideo/OVDecode.h#7 delete ... //depot/stg/opencl/drivers/opencl/api/opencl/OpenVideo/OVDecode.rc#2 delete ... //depot/stg/opencl/drivers/opencl/api/opencl/OpenVideo/OVDecodeTypes.h#6 delete ... //depot/stg/opencl/drivers/opencl/api/opencl/OpenVideo/OVEncode.cpp#37 delete ... //depot/stg/opencl/drivers/opencl/api/opencl/OpenVideo/OVEncode.h#11 delete ... //depot/stg/opencl/drivers/opencl/api/opencl/OpenVideo/OVEncodeTypes.h#16 delete ... //depot/stg/opencl/drivers/opencl/api/opencl/OpenVideo/OpenVideo.cpp#6 delete ... //depot/stg/opencl/drivers/opencl/api/opencl/OpenVideo/OpenVideo.def#3 delete ... //depot/stg/opencl/drivers/opencl/api/opencl/OpenVideo/OpenVideo.h#5 delete ... //depot/stg/opencl/drivers/opencl/api/opencl/OpenVideo/OpenVideo.rc#3 delete ... //depot/stg/opencl/drivers/opencl/api/opencl/OpenVideo/OpenVideo.sln#5 delete ... //depot/stg/opencl/drivers/opencl/api/opencl/OpenVideo/OpenVideo.vcxproj#11 delete ... //depot/stg/opencl/drivers/opencl/api/opencl/OpenVideo/OpenVideo.vcxproj.filters#3 delete ... //depot/stg/opencl/drivers/opencl/api/opencl/OpenVideo/OpenVideo_2008.sln#2 delete ... //depot/stg/opencl/drivers/opencl/api/opencl/OpenVideo/OpenVideo_2008.vcproj#2 delete ... //depot/stg/opencl/drivers/opencl/api/opencl/OpenVideo/atiumdva.cap#2 delete ... //depot/stg/opencl/drivers/opencl/api/opencl/OpenVideo/build.bat#2 delete ... //depot/stg/opencl/drivers/opencl/api/opencl/OpenVideo/build/Makefile#6 delete ... //depot/stg/opencl/drivers/opencl/api/opencl/OpenVideo/build/Makefile.ov#18 delete ... //depot/stg/opencl/drivers/opencl/api/opencl/OpenVideo/build/Makefile.ovd#27 delete ... //depot/stg/opencl/drivers/opencl/api/opencl/OpenVideo/buildOV/Makefile#5 delete ... //depot/stg/opencl/drivers/opencl/api/opencl/OpenVideo/res/OpenVideo.rc2#2 delete ... //depot/stg/opencl/drivers/opencl/api/opencl/amdocl/build/Makefile.api#113 edit ... //depot/stg/opencl/drivers/opencl/api/opencl/amdocl/cl_common.hpp#17 edit ... //depot/stg/opencl/drivers/opencl/api/opencl/amdocl/cl_context.cpp#43 edit ... //depot/stg/opencl/drivers/opencl/api/opencl/amdocl/cl_device.cpp#59 edit ... //depot/stg/opencl/drivers/opencl/api/opencl/amdocl/cl_open_video.cpp#35 delete ... //depot/stg/opencl/drivers/opencl/api/opencl/amdocl/cl_open_video_amd.h#20 delete ... //depot/stg/opencl/drivers/opencl/runtime/device/cpu/cpudevice.cpp#273 edit ... //depot/stg/opencl/drivers/opencl/runtime/device/cpu/cpudevice.hpp#91 edit ... //depot/stg/opencl/drivers/opencl/runtime/device/cpu/cpuvirtual.cpp#24 edit ... //depot/stg/opencl/drivers/opencl/runtime/device/cpu/cpuvirtual.hpp#12 edit ... //depot/stg/opencl/drivers/opencl/runtime/device/device.hpp#247 edit ... //depot/stg/opencl/drivers/opencl/runtime/device/gpu/gpudevice.cpp#512 edit ... //depot/stg/opencl/drivers/opencl/runtime/device/gpu/gpudevice.hpp#145 edit ... //depot/stg/opencl/drivers/opencl/runtime/device/gpu/gpusettings.cpp#311 edit ... //depot/stg/opencl/drivers/opencl/runtime/device/gpu/gpusettings.hpp#91 edit ... //depot/stg/opencl/drivers/opencl/runtime/device/gpu/gpuvirtual.cpp#366 edit ... //depot/stg/opencl/drivers/opencl/runtime/device/gpu/gpuvirtual.hpp#130 edit ... //depot/stg/opencl/drivers/opencl/runtime/device/gpu/gslbe/src/rt/GSLContext.cpp#73 edit ... //depot/stg/opencl/drivers/opencl/runtime/device/gpu/gslbe/src/rt/GSLContext.h#45 edit ... //depot/stg/opencl/drivers/opencl/runtime/device/hsa/hsadevice.cpp#92 edit ... //depot/stg/opencl/drivers/opencl/runtime/device/hsa/hsadevice.hpp#49 edit ... //depot/stg/opencl/drivers/opencl/runtime/device/hsa/hsavirtual.hpp#28 edit ... //depot/stg/opencl/drivers/opencl/runtime/device/hsa_foundation/hsadevice.cpp#34 edit ... //depot/stg/opencl/drivers/opencl/runtime/device/hsa_foundation/hsadevice.hpp#15 edit ... //depot/stg/opencl/drivers/opencl/runtime/device/hsa_foundation/hsavirtual.hpp#20 edit ... //depot/stg/opencl/drivers/opencl/runtime/platform/command.hpp#78 edit ... //depot/stg/opencl/drivers/opencl/runtime/platform/commandqueue.cpp#21 edit ... //depot/stg/opencl/drivers/opencl/runtime/platform/commandqueue.hpp#16 edit ... //depot/stg/opencl/drivers/opencl/runtime/platform/object.hpp#15 edit ... //depot/stg/opencl/drivers/opencl/runtime/platform/video_session.hpp#13 delete ... //depot/stg/opencl/drivers/opencl/runtime/top.hpp#22 edit ... //depot/stg/opencl/drivers/opencl/runtime/utils/flags.hpp#235 edit
Αυτή η υποβολή περιλαμβάνεται σε:
foreman
@@ -164,9 +164,6 @@ NullDevice::create(CALtarget target)
|
||||
gpu::Settings* gpuSettings = reinterpret_cast<gpu::Settings*>(settings_);
|
||||
// Create setting for the offline target
|
||||
if ((gpuSettings == NULL) || !gpuSettings->create(calAttr
|
||||
#if cl_amd_open_video
|
||||
, calVideoAttr
|
||||
#endif //cl_amd_open_video
|
||||
)) {
|
||||
return false;
|
||||
}
|
||||
@@ -178,9 +175,6 @@ NullDevice::create(CALtarget target)
|
||||
|
||||
// Fill the device info structure
|
||||
fillDeviceInfo(calAttr, calDevStatus, 4096, 1, true
|
||||
#if cl_amd_open_video
|
||||
, getVideoAttribs()
|
||||
#endif //cl_amd_open_video
|
||||
);
|
||||
|
||||
if (settings().hsail_ || (settings().oclVersion_ == OpenCL20)) {
|
||||
@@ -235,10 +229,6 @@ void NullDevice::fillDeviceInfo(
|
||||
size_t maxTextureSize,
|
||||
uint numComputeRings,
|
||||
bool isVirtualMode
|
||||
#if cl_amd_open_video
|
||||
,
|
||||
const CALdeviceVideoAttribs& calVideoAttr
|
||||
#endif // cl_amd_open_video
|
||||
)
|
||||
{
|
||||
info_.type_ = CL_DEVICE_TYPE_GPU;
|
||||
@@ -425,23 +415,6 @@ void NullDevice::fillDeviceInfo(
|
||||
|
||||
info_.platform_ = AMD_PLATFORM;
|
||||
|
||||
#if cl_amd_open_video
|
||||
// Open Video support
|
||||
// Decoder
|
||||
info_.openVideo_ = settings().openVideo_;
|
||||
info_.maxVideoSessions_ = calVideoAttr.max_decode_sessions;
|
||||
info_.numVideoAttribs_ = (calVideoAttr.data_size - 2 * sizeof(CALuint))
|
||||
/ sizeof(CALvideoAttrib);
|
||||
info_.videoAttribs_ = const_cast<cl_video_attrib_amd*>(
|
||||
reinterpret_cast<const cl_video_attrib_amd*>(calVideoAttr.video_attribs));
|
||||
|
||||
// Encoder
|
||||
info_.numVideoEncAttribs_ = (calVideoAttr.data_size - 2 * sizeof(CALuint))
|
||||
/ sizeof(CALvideoEncAttrib);
|
||||
info_.videoEncAttribs_ = const_cast<cl_video_attrib_encode_amd*>(
|
||||
reinterpret_cast<const cl_video_attrib_encode_amd*>(calVideoAttr.video_enc_attribs));
|
||||
#endif // cl_amd_open_video
|
||||
|
||||
::strcpy(info_.name_, hwInfo()->targetName_);
|
||||
::strcpy(info_.vendor_, "Advanced Micro Devices, Inc.");
|
||||
::snprintf(info_.driverVersion_, sizeof(info_.driverVersion_) - 1,
|
||||
@@ -817,9 +790,6 @@ Device::create(CALuint ordinal, CALuint numOfDevices)
|
||||
settings_ = new gpu::Settings();
|
||||
gpu::Settings* gpuSettings = reinterpret_cast<gpu::Settings*>(settings_);
|
||||
if ((gpuSettings == NULL) || !gpuSettings->create(getAttribs()
|
||||
#if cl_amd_open_video
|
||||
, getVideoAttribs()
|
||||
#endif // cl_amd_open_video
|
||||
, appProfile_.reportAsOCL12Device()
|
||||
)) {
|
||||
return false;
|
||||
@@ -928,9 +898,6 @@ Device::create(CALuint ordinal, CALuint numOfDevices)
|
||||
fillDeviceInfo(getAttribs(), getStatus(),
|
||||
static_cast<size_t>(getMaxTextureSize()),
|
||||
engines().numComputeRings(), heap()->isVirtual()
|
||||
#if cl_amd_open_video
|
||||
, getVideoAttribs()
|
||||
#endif //cl_amd_open_video
|
||||
);
|
||||
|
||||
if (settings().hsail_ || (settings().oclVersion_ == OpenCL20)) {
|
||||
@@ -1075,9 +1042,6 @@ Device::initializeHeapResources()
|
||||
xferQueue_ = new VirtualGPU(*this);
|
||||
if (!(xferQueue_ && xferQueue_->create(
|
||||
false
|
||||
#if cl_amd_open_video
|
||||
,NULL
|
||||
#endif // cl_amd_open_video
|
||||
))) {
|
||||
delete xferQueue_;
|
||||
xferQueue_ = NULL;
|
||||
@@ -1100,9 +1064,6 @@ Device::createVirtualDevice(
|
||||
bool interopQueue = false;
|
||||
uint rtCUs = 0;
|
||||
uint deviceQueueSize = 0;
|
||||
#if cl_amd_open_video
|
||||
void* calVideoProperties = NULL;
|
||||
#endif // cl_amd_open_video
|
||||
|
||||
if (queue != NULL) {
|
||||
profiling = queue->properties().test(CL_QUEUE_PROFILING_ENABLE);
|
||||
@@ -1130,9 +1091,6 @@ Device::createVirtualDevice(
|
||||
VirtualGPU* vgpu = new VirtualGPU(*this);
|
||||
if (vgpu && vgpu->create(
|
||||
profiling
|
||||
#if cl_amd_open_video
|
||||
, calVideoProperties
|
||||
#endif // cl_amd_open_video
|
||||
, deviceQueueSize
|
||||
)) {
|
||||
return vgpu;
|
||||
|
||||
Αναφορά σε νέο ζήτημα
Block a user