 
 void CudaRenderer::render() {
     // 256 threads per block is a healthy number
+<<<<<<< HEAD
     dim3 blockDim(BLOCKX, BLOCKY, 1);
     dim3 gridDim(
         (image->width + blockDim.x - 1) / blockDim.x,
         (image->height + blockDim.y - 1) / blockDim.y);
 
+=======
+    dim3 blockDim(16, 16, 1);
+    dim3 gridDim(
+        (image->width + blockDim.x - 1) / blockDim.x,
+        (image->height + blockDim.y - 1) / blockDim.y);
+    //dim3 gridDim((numCircles + blockDim.x - 1) / blockDim.x);
+
+    //kernelRenderCircles<<<gridDim, blockDim>>>();
+>>>>>>> afd7b1a5d2d2307df41a93caa5b528c30798c493
     kernelRenderBlocks<<<gridDim, blockDim>>>();
     cudaDeviceSynchronize();
 }

                //shadePixel(validCircleIndex+iter_count*THREADS_PER_BLK, pixelCenterNorm, p, imgPtr);
            } 
        }
    }
}


    int offset = 4 * (imageY * width + imageX);
    float4* imgPtr = (float4*)(&cuConstRendererParams.imageData[offset]);

<<<<<<< HEAD
    float invWidth = 1.f / width;
    float invHeight = 1.f / height;

