Merge "hipBindTexture() should handle nullptr offset." into amd-master-next

This commit is contained in:
Vladislav Sytchenko
2020-02-25 17:00:18 -05:00
committad av Gerrit Code Review
förälder 1d22c5b925 fd76d220a5
incheckning 2500692d4d
+2 -4
Visa fil
@@ -388,8 +388,7 @@ hipError_t ihipBindTexture(size_t* offset,
const hipChannelFormatDesc* desc,
size_t size,
hipTextureReadMode readMode) {
if ((offset == nullptr) ||
(texref == nullptr) ||
if ((texref == nullptr) ||
(devPtr == nullptr) ||
(desc == nullptr)) {
return hipErrorInvalidValue;
@@ -426,8 +425,7 @@ hipError_t ihipBindTexture2D(size_t* offset,
size_t height,
size_t pitch,
hipTextureReadMode readMode) {
if ((offset == nullptr) ||
(texref == nullptr) ||
if ((texref == nullptr) ||
(devPtr == nullptr) ||
(desc == nullptr)) {
return hipErrorInvalidValue;