[llvm-branch-commits] [llvm-branch] r167844 - /llvm/branches/R600/lib/Target/AMDGPU/MCTargetDesc/R600MCCodeEmitter.cpp

[Tom Stellard]

Author: tstellar
Date: Tue Nov 13 09:22:15 2012
New Revision: 167844

URL: http://llvm.org/viewvc/llvm-project?rev=167844&view=rev
Log:
R600: Fix sampler->resource_id mapping

Patch by: Vadim Girlin

Reviewed-by: Tom Stellard <thomas.stellard at amd.com>

Modified:
    llvm/branches/R600/lib/Target/AMDGPU/MCTargetDesc/R600MCCodeEmitter.cpp

Modified: llvm/branches/R600/lib/Target/AMDGPU/MCTargetDesc/R600MCCodeEmitter.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/branches/R600/lib/Target/AMDGPU/MCTargetDesc/R600MCCodeEmitter.cpp?rev=167844&r1=167843&r2=167844&view=diff
==============================================================================
--- llvm/branches/R600/lib/Target/AMDGPU/MCTargetDesc/R600MCCodeEmitter.cpp (original)
+++ llvm/branches/R600/lib/Target/AMDGPU/MCTargetDesc/R600MCCodeEmitter.cpp Tue Nov 13 09:22:15 2012
@@ -349,8 +349,8 @@
   // Emit instruction
   EmitByte(getBinaryCodeForInstr(MI, Fixups), OS);
 
-  // XXX: Emit resource id r600_shader.c uses sampler + 1.  Why?
-  EmitByte(sampler + 1 + 1, OS);
+  // XXX: Emit resource id (sampler + 3 (R600_MAX_CONST_BUFFERS) )
+  EmitByte(sampler + 3, OS);
 
   // Emit source register
   EmitByte(getHWReg(MI.getOperand(1).getReg()), OS);