Remove references to software rendering in Renderer9.

src/libEGL/Display.cpp

@@ -502,7 +502,6 @@ bool Display::hasExistingWindowSurface(HWND window)
 
 void Display::initExtensionString()
 {
-    HMODULE swiftShader = GetModuleHandle(TEXT("swiftshader_d3d9.dll"));
     bool shareHandleSupported = mRenderer->getShareHandleSupport();
 
     mExtensionString = "";
@@ -520,11 +519,6 @@ void Display::initExtensionString()
 
     mExtensionString += "EGL_ANGLE_window_fixed_size ";
 
-    if (swiftShader)
-    {
-        mExtensionString += "EGL_ANGLE_software_display ";
-    }
-
     if (shareHandleSupported)
     {
         mExtensionString += "EGL_ANGLE_surface_d3d_texture_2d_share_handle ";

src/libGLESv2/renderer/Renderer.cpp

@@ -69,8 +69,7 @@ rx::Renderer *glCreateRenderer(egl::Display *display, HDC hDc, EGLNativeDisplayT
 #if defined(ANGLE_ENABLE_D3D9)
     if (displayId != EGL_D3D11_ONLY_DISPLAY_ANGLE)
     {
-        bool softwareDevice = (displayId == EGL_SOFTWARE_DISPLAY_ANGLE);
-        rx::Renderer9 *renderer = new rx::Renderer9(display, hDc, softwareDevice);
+        rx::Renderer9 *renderer = new rx::Renderer9(display, hDc);
         if (renderer->initialize() == EGL_SUCCESS)
         {
             return renderer;

src/libGLESv2/renderer/d3d9/Renderer9.cpp

@@ -91,7 +91,7 @@ enum
     MAX_TEXTURE_IMAGE_UNITS_VTF_SM3 = 4
 };
 
-Renderer9::Renderer9(egl::Display *display, HDC hDc, bool softwareDevice) : Renderer(display), mDc(hDc), mSoftwareDevice(softwareDevice)
+Renderer9::Renderer9(egl::Display *display, HDC hDc) : Renderer(display), mDc(hDc)
 {
     mD3d9Module = NULL;
 
@@ -180,16 +180,8 @@ EGLint Renderer9::initialize()
         return EGL_NOT_INITIALIZED;
     }
 
-    if (mSoftwareDevice)
-    {
-        TRACE_EVENT0("gpu", "GetModuleHandle_swiftshader");
-        mD3d9Module = GetModuleHandle(TEXT("swiftshader_d3d9.dll"));
-    }
-    else
-    {
-        TRACE_EVENT0("gpu", "GetModuleHandle_d3d9");
-        mD3d9Module = GetModuleHandle(TEXT("d3d9.dll"));
-    }
+    TRACE_EVENT0("gpu", "GetModuleHandle_d3d9");
+    mD3d9Module = GetModuleHandle(TEXT("d3d9.dll"));
 
     if (mD3d9Module == NULL)
     {

src/libGLESv2/renderer/d3d9/Renderer9.h

@@ -33,7 +33,7 @@ class Blit9;
 class Renderer9 : public Renderer
 {
   public:
-    Renderer9(egl::Display *display, HDC hDc, bool softwareDevice);
+    Renderer9(egl::Display *display, HDC hDc);
     virtual ~Renderer9();
 
     static Renderer9 *makeRenderer9(Renderer *renderer);
@@ -266,7 +266,6 @@ class Renderer9 : public Renderer
 
     UINT mAdapter;
     D3DDEVTYPE mDeviceType;
-    bool mSoftwareDevice;   // FIXME: Deprecate
     IDirect3D9 *mD3d9;  // Always valid after successful initialization.
     IDirect3D9Ex *mD3d9Ex;  // Might be null if D3D9Ex is not supported.
     IDirect3DDevice9 *mDevice;