Remove DE_NULL from the repo

This change replaces DE_NULL and (X *)DE_NULL with nullptr with the
following sed command:

git ls-files | grep -v -e framework/delibs/debase/deDefs.h \
                       -e framework/delibs/debase/deDefs_kc_cts.h \
             | xargs -P 8 -d '\n' sed -b -i 's|\<DE_NULL\>|nullptr|g;
                                      s|([^()]*)nullptr|nullptr|g'

The definition of DE_NULL in framework/delibs/debase/deDefs.h is kept
for now to avoid unnecessary pain when DE_NULL is reintroduced by
merges from branches.  Eventually this should be deleted with new
branches being based on this change and DE_NULL not getting copy-pasted
around all the time.

Exceptions:

* In modules/gles31/functional/es31fShaderImageLoadStoreTests.cpp, the
  casts of nullptr are retained due to a limitation with ?: and
  inherited types.
* In
  external/vulkancts/modules/vulkan/compute/vktComputeCooperativeMatrixTests.cpp,
  there is a cast of nullptr to resolve a function overload.
* In
  external/vulkancts/modules/vulkan/shaderrender/vktShaderRenderTextureFunctionTests.cpp
  and
  external/vulkancts/modules/vulkan/shaderrender/vktShaderRenderDerivateTests.cpp,
  there is a cast of nullptr to resolve a constructor overload.
* In external/vulkancts/modules/vulkan/util/vktExternalMemoryUtil.cpp,
  there is a cast to vk::pt::Win32LPCWSTR.

Components: Framework, Vulkan, OpenGL
VK-GL-CTS issue: 4652

Change-Id: Ia9f3ccc251b0dbf51ccd40f267cec144d4efca7a

Author: ShabbyX

doc/testspecs/VK/apitests.adoc

@@ -68,7 +68,7 @@ tcu::TestStatus createSamplerTest (Context& context)
         const struct VkSamplerCreateInfo        samplerInfo =
         {
             VK_STRUCTURE_TYPE_SAMPLER_CREATE_INFO,  //  VkStructureType sType;
-            DE_NULL,                                //  const void*     pNext;
+            nullptr,                                //  const void*     pNext;
             VK_TEX_FILTER_NEAREST,                  //  VkTexFilter     magFilter;
             VK_TEX_FILTER_NEAREST,                  //  VkTexFilter     minFilter;
             VK_TEX_MIPMAP_MODE_BASE,                //  VkTexMipmapMode mipMode;

execserver/tools/xsMain.cpp

@@ -60,7 +60,7 @@ int main(int argc, const char *const *argv)
     xs::PosixTestProcess testProcess;
 
     // Set line buffered mode to stdout so executor gets any log messages in a timely manner.
-    setvbuf(stdout, DE_NULL, _IOLBF, 4 * 1024);
+    setvbuf(stdout, nullptr, _IOLBF, 4 * 1024);
 #endif
 
     // Parse command line.

execserver/tools/xsTest.cpp

@@ -252,7 +252,7 @@ void TestExecutor::runCases(const std::vector<TestCase *> &testCases)
 class FilePrinter : public de::Thread
 {
 public:
-    FilePrinter(void) : m_curFile(DE_NULL)
+    FilePrinter(void) : m_curFile(nullptr)
     {
     }
 
@@ -271,7 +271,7 @@ class FilePrinter : public de::Thread
         while (deFile_read(m_curFile, &buf[0], (int64_t)sizeof(buf), &numRead) == DE_FILERESULT_SUCCESS)
             fwrite(&buf[0], 1, (size_t)numRead, stdout);
 
-        m_curFile = DE_NULL;
+        m_curFile = nullptr;
     }
 
 private:
@@ -283,7 +283,7 @@ bool TestExecutor::runCase(TestCase *testCase)
     printf("%s\n", testCase->getName());
 
     bool success          = false;
-    deProcess *serverProc = DE_NULL;
+    deProcess *serverProc = nullptr;
     FilePrinter stdoutPrinter;
     FilePrinter stderrPrinter;
 
@@ -295,7 +295,7 @@ bool TestExecutor::runCase(TestCase *testCase)
             serverProc     = deProcess_create();
             XS_CHECK(serverProc);
 
-            if (!deProcess_start(serverProc, cmdLine.c_str(), DE_NULL))
+            if (!deProcess_start(serverProc, cmdLine.c_str(), nullptr))
             {
                 string errMsg = deProcess_getLastError(serverProc);
                 deProcess_destroy(serverProc);
@@ -972,18 +972,18 @@ void testProcFile (void)
         deDeleteFile("test.txt");
     deFile* file = deFile_create("test.txt", DE_FILEMODE_CREATE|DE_FILEMODE_WRITE);
     const char test[] = "Hello";
-    XS_CHECK(deFile_write(file, test, sizeof(test), DE_NULL) == DE_FILERESULT_SUCCESS);
+    XS_CHECK(deFile_write(file, test, sizeof(test), nullptr) == DE_FILERESULT_SUCCESS);
     deFile_destroy(file);
 
     /* Read. */
     char buf[10] = { 0 };
     file = deFile_create("test.txt", DE_FILEMODE_OPEN|DE_FILEMODE_READ);
-    XS_CHECK(deFile_read(file, buf, sizeof(test), DE_NULL) == DE_FILERESULT_SUCCESS);
+    XS_CHECK(deFile_read(file, buf, sizeof(test), nullptr) == DE_FILERESULT_SUCCESS);
     printf("buf: %s\n", buf);
     deFile_destroy(file);
 
     /* Process test. */
-    deProcess* proc = deProcess_create("ls -lah /Users/pyry", DE_NULL);
+    deProcess* proc = deProcess_create("ls -lah /Users/pyry", nullptr);
     deFile* out = deProcess_getStdOut(proc);
 
     int64_t numRead = 0;

execserver/xsExecutionServer.cpp

@@ -48,7 +48,7 @@ inline bool MessageBuilder::isComplete(void) const
 
 const uint8_t *MessageBuilder::getMessageData(void) const
 {
-    return m_buffer.size() > MESSAGE_HEADER_SIZE ? &m_buffer[MESSAGE_HEADER_SIZE] : DE_NULL;
+    return m_buffer.size() > MESSAGE_HEADER_SIZE ? &m_buffer[MESSAGE_HEADER_SIZE] : nullptr;
 }
 
 size_t MessageBuilder::getMessageDataSize(void) const
@@ -140,7 +140,7 @@ void ExecutionServer::connectionDone(ConnectionHandler *handler)
 ExecutionRequestHandler::ExecutionRequestHandler(ExecutionServer *server, de::Socket *socket)
     : ConnectionHandler(server, socket)
     , m_execServer(server)
-    , m_testDriver(DE_NULL)
+    , m_testDriver(nullptr)
     , m_bufferIn(RECV_BUFFER_SIZE)
     , m_bufferOut(SEND_BUFFER_SIZE)
     , m_run(false)
@@ -186,7 +186,7 @@ void ExecutionRequestHandler::handle(void)
         {
         }
         m_execServer->releaseTestDriver(m_testDriver);
-        m_testDriver = DE_NULL;
+        m_testDriver = nullptr;
     }
 
     // Close connection.

execserver/xsPosixFileReader.cpp

@@ -30,7 +30,7 @@ namespace xs
 namespace posix
 {
 
-FileReader::FileReader(int blockSize, int numBlocks) : m_file(DE_NULL), m_buf(blockSize, numBlocks), m_isRunning(false)
+FileReader::FileReader(int blockSize, int numBlocks) : m_file(nullptr), m_buf(blockSize, numBlocks), m_isRunning(false)
 {
 }
 
@@ -50,7 +50,7 @@ void FileReader::start(const char *filename)
     if (!deFile_setFlags(m_file, DE_FILE_NONBLOCKING))
     {
         deFile_destroy(m_file);
-        m_file = DE_NULL;
+        m_file = nullptr;
         XS_FAIL("Failed to set non-blocking mode");
     }
 #endif
@@ -105,7 +105,7 @@ void FileReader::stop(void)
 
     // Destroy file.
     deFile_destroy(m_file);
-    m_file = DE_NULL;
+    m_file = nullptr;
 
     // Reset buffer.
     m_buf.clear();

execserver/xsPosixTestProcess.cpp

@@ -37,7 +37,7 @@ namespace xs
 namespace posix
 {
 
-CaseListWriter::CaseListWriter(void) : m_file(DE_NULL), m_run(false)
+CaseListWriter::CaseListWriter(void) : m_file(nullptr), m_run(false)
 {
 }
 
@@ -90,10 +90,10 @@ void CaseListWriter::stop(void)
     // Join thread.
     join();
 
-    m_file = DE_NULL;
+    m_file = nullptr;
 }
 
-PipeReader::PipeReader(ThreadedByteBuffer *dst) : m_file(DE_NULL), m_buf(dst)
+PipeReader::PipeReader(ThreadedByteBuffer *dst) : m_file(nullptr), m_buf(dst)
 {
 }
 
@@ -158,13 +158,13 @@ void PipeReader::stop(void)
     // Join thread.
     join();
 
-    m_file = DE_NULL;
+    m_file = nullptr;
 }
 
 } // namespace posix
 
 PosixTestProcess::PosixTestProcess(void)
-    : m_process(DE_NULL)
+    : m_process(nullptr)
     , m_processStartTime(0)
     , m_infoBuffer(INFO_BUFFER_BLOCK_SIZE, INFO_BUFFER_NUM_BLOCKS)
     , m_stdOutReader(&m_infoBuffer)
@@ -209,12 +209,12 @@ void PosixTestProcess::start(const char *name, const char *params, const char *w
 
     try
     {
-        m_process->start(cmdLine.c_str(), strlen(workingDir) > 0 ? workingDir : DE_NULL);
+        m_process->start(cmdLine.c_str(), strlen(workingDir) > 0 ? workingDir : nullptr);
     }
     catch (const de::ProcessError &e)
     {
         delete m_process;
-        m_process = DE_NULL;
+        m_process = nullptr;
         throw TestProcessException(e.what());
     }
 
@@ -286,7 +286,7 @@ void PosixTestProcess::cleanup(void)
         }
 
         delete m_process;
-        m_process = DE_NULL;
+        m_process = nullptr;
     }
 }
 

execserver/xsTcpServer.cpp

@@ -44,12 +44,12 @@ TcpServer::TcpServer(deSocketFamily family, int port) : m_socket()
 
 void TcpServer::runServer(void)
 {
-    de::Socket *clientSocket = DE_NULL;
+    de::Socket *clientSocket = nullptr;
     de::SocketAddress clientAddr;
 
-    while ((clientSocket = m_socket.accept(clientAddr)) != DE_NULL)
+    while ((clientSocket = m_socket.accept(clientAddr)) != nullptr)
     {
-        ConnectionHandler *handler = DE_NULL;
+        ConnectionHandler *handler = nullptr;
 
         try
         {

execserver/xsWin32TestProcess.cpp

@@ -58,7 +58,7 @@ static std::string formatErrMsg(DWORD error, const char *msg)
 #endif
 
     if (FormatMessage(FORMAT_MESSAGE_ALLOCATE_BUFFER | FORMAT_MESSAGE_FROM_SYSTEM | FORMAT_MESSAGE_IGNORE_INSERTS, NULL,
-                      error, MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT), (LPSTR)&msgBuf, 0, DE_NULL) > 0)
+                      error, MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT), (LPSTR)&msgBuf, 0, nullptr) > 0)
         str << msg << ", error " << error << ": " << msgBuf;
     else
         str << msg << ", error " << error;
@@ -354,8 +354,8 @@ void TestLogReader::start(const char *filename)
 {
     DE_ASSERT(m_logFile == INVALID_HANDLE_VALUE && !m_reader.isStarted());
 
-    m_logFile = CreateFile(filename, GENERIC_READ, FILE_SHARE_DELETE | FILE_SHARE_READ | FILE_SHARE_WRITE, DE_NULL,
-                           OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL | FILE_FLAG_OVERLAPPED, DE_NULL);
+    m_logFile = CreateFile(filename, GENERIC_READ, FILE_SHARE_DELETE | FILE_SHARE_READ | FILE_SHARE_WRITE, nullptr,
+                           OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL | FILE_FLAG_OVERLAPPED, nullptr);
 
     if (m_logFile == INVALID_HANDLE_VALUE)
         throw Error(GetLastError(), "Failed to open log file");
@@ -463,7 +463,7 @@ static void createPipeWithOverlappedIO(HANDLE *readHandleOut, HANDLE *writeHandl
                              0,                                 /* No sharing.                */
                              securityAttr, OPEN_EXISTING,       /* Assume existing object.    */
                              FILE_ATTRIBUTE_NORMAL | writeMode, /* Open mode / flags.        */
-                             DE_NULL /* Template file.            */);
+                             nullptr /* Template file.            */);
 
     if (writeHandle == INVALID_HANDLE_VALUE)
     {
@@ -507,7 +507,7 @@ void Process::start(const char *commandLine, const char *workingDirectory)
         // Security attributes for inheriting handle.
         securityAttr.nLength              = sizeof(SECURITY_ATTRIBUTES);
         securityAttr.bInheritHandle       = TRUE;
-        securityAttr.lpSecurityDescriptor = DE_NULL;
+        securityAttr.lpSecurityDescriptor = nullptr;
 
         createPipeWithOverlappedIO(&stdInRead, &stdInWrite, 0, FILE_FLAG_OVERLAPPED, &securityAttr);
         createPipeWithOverlappedIO(&stdOutRead, &stdOutWrite, FILE_FLAG_OVERLAPPED, 0, &securityAttr);
@@ -525,7 +525,7 @@ void Process::start(const char *commandLine, const char *workingDirectory)
         startInfo.hStdInput  = stdInRead;
         startInfo.dwFlags |= STARTF_USESTDHANDLES;
 
-        if (!CreateProcess(DE_NULL, (LPTSTR)commandLine, DE_NULL, DE_NULL, TRUE /* inherit handles */, 0, DE_NULL,
+        if (!CreateProcess(nullptr, (LPTSTR)commandLine, nullptr, nullptr, TRUE /* inherit handles */, 0, nullptr,
                            workingDirectory, &startInfo, &m_procInfo))
             throw Error(GetLastError(), "CreateProcess() failed");
     }
@@ -621,7 +621,7 @@ void Process::kill(void)
 } // namespace win32
 
 Win32TestProcess::Win32TestProcess(void)
-    : m_process(DE_NULL)
+    : m_process(nullptr)
     , m_processStartTime(0)
     , m_infoBuffer(INFO_BUFFER_BLOCK_SIZE, INFO_BUFFER_NUM_BLOCKS)
     , m_stdOutReader(&m_infoBuffer)
@@ -677,12 +677,12 @@ void Win32TestProcess::start(const char *name, const char *params, const char *w
 
     try
     {
-        m_process->start(cmdLine.c_str(), strlen(workingDir) > 0 ? workingDir : DE_NULL);
+        m_process->start(cmdLine.c_str(), strlen(workingDir) > 0 ? workingDir : nullptr);
     }
     catch (const std::exception &e)
     {
         delete m_process;
-        m_process = DE_NULL;
+        m_process = nullptr;
         throw TestProcessException(e.what());
     }
 
@@ -742,7 +742,7 @@ void Win32TestProcess::cleanup(void)
         }
 
         delete m_process;
-        m_process = DE_NULL;
+        m_process = nullptr;
     }
 }
 

executor/tools/xeBatchResultToXml.cpp

@@ -298,7 +298,7 @@ static void writeTestCaseListNode(const xe::TestNode *testNode, const ShortTestR
 
         const xe::TestCase *testCase                 = static_cast<const xe::TestCase *>(testNode);
         ShortTestResultMap::const_iterator resultPos = resultMap.find(testCase);
-        const xe::TestCaseResultHeader *result       = resultPos != resultMap.end() ? resultPos->second : DE_NULL;
+        const xe::TestCaseResultHeader *result       = resultPos != resultMap.end() ? resultPos->second : nullptr;
 
         DE_ASSERT(result);
 

executor/tools/xeCommandLineExecutor.cpp

@@ -98,14 +98,14 @@ void registerOptions(de::cmdline::Parser &parser)
            << Option<TestSet>("t", "testset", "Comma-separated list of include filters.", parseCommaSeparatedList)
            << Option<ExcludeSet>("e", "exclude", "Comma-separated list of exclude filters.", parseCommaSeparatedList,
                                  "")
-           << Option<ContinueFile>(DE_NULL, "continue",
+           << Option<ContinueFile>(nullptr, "continue",
                                    "Continue execution by initializing results from existing test log.")
            << Option<TestLogFile>("o", "out", "Output test log filename.", "TestLog.qpa")
            << Option<InfoLogFile>("i", "info", "Output info log filename.", "InfoLog.txt")
-           << Option<Summary>(DE_NULL, "summary", "Print summary after running tests.", s_yesNo, "yes")
+           << Option<Summary>(nullptr, "summary", "Print summary after running tests.", s_yesNo, "yes")
            << Option<BinaryName>("b", "binaryname", "Test binary path. Relative to working directory.", "<Unused>")
            << Option<WorkingDir>("wd", "workdir", "Working directory for the test execution.", ".")
-           << Option<CmdLineArgs>(DE_NULL, "cmdline", "Additional command line arguments for the test binary.", "");
+           << Option<CmdLineArgs>(nullptr, "cmdline", "Additional command line arguments for the test binary.", "");
 }
 
 } // namespace opt
@@ -459,7 +459,7 @@ xe::CommLink *createCommLink(const CommandLine &cmdLine)
         xe::LocalTcpIpLink *link = new xe::LocalTcpIpLink();
         try
         {
-            link->start(cmdLine.serverBinOrAddress.c_str(), DE_NULL, cmdLine.port);
+            link->start(cmdLine.serverBinOrAddress.c_str(), nullptr, cmdLine.port);
             return link;
         }
         catch (...)
@@ -500,13 +500,13 @@ xe::CommLink *createCommLink(const CommandLine &cmdLine)
     else
     {
         DE_ASSERT(false);
-        return DE_NULL;
+        return nullptr;
     }
 }
 
 #if (DE_OS == DE_OS_UNIX) || (DE_OS == DE_OS_ANDROID)
 
-static xe::BatchExecutor *s_executor = DE_NULL;
+static xe::BatchExecutor *s_executor = nullptr;
 
 void signalHandler(int, siginfo_t *, void *)
 {
@@ -523,7 +523,7 @@ void setupSignalHandler(xe::BatchExecutor *executor)
     sa.sa_flags     = SA_SIGINFO | SA_RESTART;
     sigfillset(&sa.sa_mask);
 
-    sigaction(SIGINT, &sa, DE_NULL);
+    sigaction(SIGINT, &sa, nullptr);
 }
 
 void resetSignalHandler(void)
@@ -534,13 +534,13 @@ void resetSignalHandler(void)
     sa.sa_flags   = SA_RESTART;
     sigfillset(&sa.sa_mask);
 
-    sigaction(SIGINT, &sa, DE_NULL);
-    s_executor = DE_NULL;
+    sigaction(SIGINT, &sa, nullptr);
+    s_executor = nullptr;
 }
 
 #elif (DE_OS == DE_OS_WIN32)
 
-static xe::BatchExecutor *s_executor = DE_NULL;
+static xe::BatchExecutor *s_executor = nullptr;
 
 void signalHandler(int)
 {
@@ -557,7 +557,7 @@ void setupSignalHandler(xe::BatchExecutor *executor)
 void resetSignalHandler(void)
 {
     signal(SIGINT, SIG_DFL);
-    s_executor = DE_NULL;
+    s_executor = nullptr;
 }
 
 #else