diff --git a/src/d3d11/d3d11_context.cpp b/src/d3d11/d3d11_context.cpp
index b7b3d5c11..59bd4f0cd 100644
--- a/src/d3d11/d3d11_context.cpp
+++ b/src/d3d11/d3d11_context.cpp
@@ -105,10 +105,10 @@ namespace dxvk {
 //     this->DSSetShaderResources(0, D3D11_COMMONSHADER_INPUT_RESOURCE_SLOT_COUNT, nullptr);
 //     this->DSSetSamplers       (0, D3D11_COMMONSHADER_SAMPLER_SLOT_COUNT, nullptr);
     
-//     this->GSSetShader(nullptr, nullptr, 0);
-//     this->GSSetConstantBuffers(0, D3D11_COMMONSHADER_CONSTANT_BUFFER_API_SLOT_COUNT, nullptr);
-//     this->GSSetShaderResources(0, D3D11_COMMONSHADER_INPUT_RESOURCE_SLOT_COUNT, nullptr);
-//     this->GSSetSamplers       (0, D3D11_COMMONSHADER_SAMPLER_SLOT_COUNT, nullptr);
+    this->GSSetShader(nullptr, nullptr, 0);
+    this->GSSetConstantBuffers(0, D3D11_COMMONSHADER_CONSTANT_BUFFER_API_SLOT_COUNT, nullptr);
+    this->GSSetShaderResources(0, D3D11_COMMONSHADER_INPUT_RESOURCE_SLOT_COUNT, nullptr);
+    this->GSSetSamplers       (0, D3D11_COMMONSHADER_SAMPLER_SLOT_COUNT, nullptr);
     
     this->PSSetShader(nullptr, nullptr, 0);
     this->PSSetConstantBuffers(0, D3D11_COMMONSHADER_CONSTANT_BUFFER_API_SLOT_COUNT, nullptr);
@@ -972,8 +972,17 @@ namespace dxvk {
           ID3D11GeometryShader*             pShader,
           ID3D11ClassInstance* const*       ppClassInstances,
           UINT                              NumClassInstances) {
-    if (m_state.gs.shader.ptr() != pShader)
-      Logger::err("D3D11DeviceContext::GSSetShader: Not implemented");
+    auto shader = static_cast<D3D11GeometryShader*>(pShader);
+    
+    if (NumClassInstances != 0)
+      Logger::err("D3D11DeviceContext::GSSetShader: Class instances not supported");
+    
+    if (m_state.gs.shader != shader) {
+      m_state.gs.shader = shader;
+      
+      m_context->bindShader(VK_SHADER_STAGE_GEOMETRY_BIT,
+        shader != nullptr ? shader->GetShader() : nullptr);
+    }
   }
   
   
@@ -981,7 +990,11 @@ namespace dxvk {
           UINT                              StartSlot,
           UINT                              NumBuffers,
           ID3D11Buffer* const*              ppConstantBuffers) {
-    Logger::err("D3D11DeviceContext::GSSetConstantBuffers: Not implemented");
+    this->BindConstantBuffers(
+      DxbcProgramType::GeometryShader,
+      &m_state.gs.constantBuffers,
+      StartSlot, NumBuffers,
+      ppConstantBuffers);
   }
   
   
@@ -989,7 +1002,11 @@ namespace dxvk {
           UINT                              StartSlot,
           UINT                              NumViews,
           ID3D11ShaderResourceView* const*  ppShaderResourceViews) {
-    Logger::err("D3D11DeviceContext::GSSetShaderResources: Not implemented");
+    this->BindShaderResources(
+      DxbcProgramType::GeometryShader,
+      &m_state.gs.shaderResources,
+      StartSlot, NumViews,
+      ppShaderResourceViews);
   }
   
   
@@ -997,7 +1014,11 @@ namespace dxvk {
           UINT                              StartSlot,
           UINT                              NumSamplers,
           ID3D11SamplerState* const*        ppSamplers) {
-    Logger::err("D3D11DeviceContext::GSSetSamplers: Not implemented");
+    this->BindSamplers(
+      DxbcProgramType::GeometryShader,
+      &m_state.gs.samplers,
+      StartSlot, NumSamplers,
+      ppSamplers);
   }
   
   
@@ -1005,7 +1026,13 @@ namespace dxvk {
           ID3D11GeometryShader**            ppGeometryShader,
           ID3D11ClassInstance**             ppClassInstances,
           UINT*                             pNumClassInstances) {
-    Logger::err("D3D11DeviceContext::GSGetShader: Not implemented");
+    if (ppGeometryShader != nullptr)
+      *ppGeometryShader = m_state.gs.shader.ref();
+    
+    if (pNumClassInstances != nullptr) {
+      Logger::err("D3D11: GSGetShader: Class instances not implemented");
+      *pNumClassInstances = 0;
+    }
   }
   
   
@@ -1013,7 +1040,8 @@ namespace dxvk {
           UINT                              StartSlot,
           UINT                              NumBuffers,
           ID3D11Buffer**                    ppConstantBuffers) {
-    Logger::err("D3D11DeviceContext::GSGetConstantBuffers: Not implemented");
+    for (uint32_t i = 0; i < NumBuffers; i++)
+      ppConstantBuffers[i] = m_state.gs.constantBuffers.at(StartSlot + i).ref();
   }
   
   
@@ -1021,7 +1049,8 @@ namespace dxvk {
           UINT                              StartSlot,
           UINT                              NumViews,
           ID3D11ShaderResourceView**        ppShaderResourceViews) {
-    Logger::err("D3D11DeviceContext::GSGetShaderResources: Not implemented");
+    for (uint32_t i = 0; i < NumViews; i++)
+      ppShaderResourceViews[i] = m_state.gs.shaderResources.at(StartSlot + i).ref();
   }
   
   
@@ -1029,7 +1058,8 @@ namespace dxvk {
           UINT                              StartSlot,
           UINT                              NumSamplers,
           ID3D11SamplerState**              ppSamplers) {
-    Logger::err("D3D11DeviceContext::GSGetSamplers: Not implemented");
+    for (uint32_t i = 0; i < NumSamplers; i++)
+      ppSamplers[i] = m_state.gs.samplers.at(StartSlot + i).ref();
   }
   
   
diff --git a/src/d3d11/d3d11_device.cpp b/src/d3d11/d3d11_device.cpp
index 4259e40b2..e8c08983c 100644
--- a/src/d3d11/d3d11_device.cpp
+++ b/src/d3d11/d3d11_device.cpp
@@ -651,8 +651,18 @@ namespace dxvk {
           SIZE_T                      BytecodeLength,
           ID3D11ClassLinkage*         pClassLinkage,
           ID3D11GeometryShader**      ppGeometryShader) {
-    Logger::err("D3D11Device::CreateGeometryShader: Not implemented");
-    return E_NOTIMPL;
+    D3D11ShaderModule module;
+    
+    if (FAILED(this->CreateShaderModule(&module,
+        pShaderBytecode, BytecodeLength, pClassLinkage)))
+      return E_INVALIDARG;
+    
+    if (ppGeometryShader != nullptr) {
+      *ppGeometryShader = ref(new D3D11GeometryShader(
+        this, std::move(module)));
+    }
+    
+    return S_OK;
   }
   
   
diff --git a/src/dxvk/dxvk_context.cpp b/src/dxvk/dxvk_context.cpp
index 0d4e6b838..b41c250ec 100644
--- a/src/dxvk/dxvk_context.cpp
+++ b/src/dxvk/dxvk_context.cpp
@@ -473,7 +473,7 @@ namespace dxvk {
       // Vulkan specifies that small amounts of data (up to 64kB) can
       // be copied to a buffer directly if the size is a multiple of
       // four. Anything else must be copied through a staging buffer.
-      if ((size <= 65536) && ((size & 0x3) == 0)) {
+      if ((size <= 65536) && ((size & 0x3) == 0) && ((offset & 0x3) == 0)) {
         m_cmd->cmdUpdateBuffer(
           buffer->handle(),
           offset, size, data);