diff --git a/gfx/d3d/render_chain_cg.cpp b/gfx/d3d/render_chain_cg.cpp
index 414a3e6926..bfbd67f195 100644
--- a/gfx/d3d/render_chain_cg.cpp
+++ b/gfx/d3d/render_chain_cg.cpp
@@ -69,8 +69,6 @@ typedef struct cg_renderchain
    unsigned pixel_size;
    const video_info_t *video_info;
    state_tracker_t *tracker;
-   CGprofile cgVProf;
-   CGprofile cgFProf;
    struct state_tracker_uniform uniform_info[MAX_VARIABLES];
    struct
    {
@@ -202,20 +200,25 @@ static bool renderchain_compile_shaders(cg_renderchain_t *chain,
 {
    CGprogram *fPrg            = (CGprogram*)fragment_data;
    CGprogram *vPrg            = (CGprogram*)vertex_data;
-   const char **fragment_opts = cgD3D9GetOptimalOptions(chain->cgFProf);
-   const char **vertex_opts   = cgD3D9GetOptimalOptions(chain->cgVProf);
+   CGprofile vertex_profile   = cgD3D9GetLatestVertexProfile();
+   CGprofile fragment_profile = cgD3D9GetLatestPixelProfile();
+   const char **fragment_opts = cgD3D9GetOptimalOptions(fragment_profile);
+   const char **vertex_opts   = cgD3D9GetOptimalOptions(vertex_profile);
+
+   RARCH_LOG("[D3D Cg]: Vertex profile: %s\n", cgGetProfileString(vertex_profile));
+   RARCH_LOG("[D3D Cg]: Fragment profile: %s\n", cgGetProfileString(fragment_profile));
 
    if (shader.length() > 0)
    {
       RARCH_LOG("[D3D Cg]: Compiling shader: %s.\n", shader.c_str());
       *fPrg = cgCreateProgramFromFile(chain->cgCtx, CG_SOURCE,
-            shader.c_str(), chain->cgFProf, "main_fragment", fragment_opts);
+            shader.c_str(), fragment_profile, "main_fragment", fragment_opts);
 
       if (cgGetLastListing(chain->cgCtx))
          RARCH_ERR("[D3D Cg]: Fragment error:\n%s\n", cgGetLastListing(chain->cgCtx));
 
       *vPrg = cgCreateProgramFromFile(chain->cgCtx, CG_SOURCE,
-            shader.c_str(), chain->cgVProf, "main_vertex", vertex_opts);
+            shader.c_str(), vertex_profile, "main_vertex", vertex_opts);
 
       if (cgGetLastListing(chain->cgCtx))
          RARCH_ERR("[D3D Cg]: Vertex error:\n%s\n", cgGetLastListing(chain->cgCtx));
@@ -225,13 +228,13 @@ static bool renderchain_compile_shaders(cg_renderchain_t *chain,
       RARCH_LOG("[D3D Cg]: Compiling stock shader.\n");
 
       *fPrg = cgCreateProgram(chain->cgCtx, CG_SOURCE, stock_program,
-            chain->cgFProf, "main_fragment", fragment_opts);
+            fragment_profile, "main_fragment", fragment_opts);
 
       if (cgGetLastListing(chain->cgCtx))
          RARCH_ERR("[D3D Cg]: Fragment error:\n%s\n", cgGetLastListing(chain->cgCtx));
 
       *vPrg = cgCreateProgram(chain->cgCtx, CG_SOURCE, stock_program,
-            chain->cgVProf, "main_vertex", vertex_opts);
+            vertex_profile, "main_vertex", vertex_opts);
 
       if (cgGetLastListing(chain->cgCtx))
          RARCH_ERR("[D3D Cg]: Vertex error:\n%s\n", cgGetLastListing(chain->cgCtx));
@@ -809,35 +812,20 @@ static void *cg_d3d9_renderchain_new(void)
    return renderchain;
 }
 
-static bool d3d9_cg_init(void *data,
+static bool cg_d3d9_renderchain_init_shader(void *data,
       void *renderchain_data)
 {
    d3d_video_t *d3d              = (d3d_video_t*)data;
-   cg_renderchain_t *cg_data     = (cg_renderchain_t*)renderchain_data;
+   cg_renderchain_t *renderchain = (cg_renderchain_t*)renderchain_data;
 
-   if (!d3d || !cg_data)
+   if (!d3d || !renderchain)
       return false;
 
-   cg_data->cgCtx = cgCreateContext();
-   if (!cg_data->cgCtx)
-   {
-      RARCH_ERR("Failed to create Cg context.\n");
+   renderchain->cgCtx = cgCreateContext();
+   if (!renderchain->cgCtx)
       return false;
-   }
 
-   cg_data->cgVProf   = cgD3D9GetLatestVertexProfile();
-   cg_data->cgFProf   = cgD3D9GetLatestPixelProfile();
-
-   RARCH_LOG("[D3D Cg]: Vertex profile: %s\n", cgGetProfileString(cg_data->cgVProf));
-   RARCH_LOG("[D3D Cg]: Fragment profile: %s\n", cgGetProfileString(cg_data->cgFProf));
-
-   if (
-         cg_data->cgFProf == CG_PROFILE_UNKNOWN ||
-         cg_data->cgVProf == CG_PROFILE_UNKNOWN)
-   {
-      RARCH_ERR("Invalid profile type\n");
-      return false;
-   }
+   RARCH_LOG("[D3D]: Created shader context.\n");
 
    HRESULT ret = cgD3D9SetDevice((IDirect3DDevice9*)d3d->dev);
    if (FAILED(ret))
@@ -942,7 +930,7 @@ static bool renderchain_create_first_pass(cg_renderchain_t *chain,
    renderchain_compile_shaders(chain, &pass.fPrg,
          &pass.vPrg, info->pass->source.path);
 
-   if (!d3d9_cg_init(chain, &pass))
+   if (!cg_d3d9_renderchain_init_shader_fvf(chain, &pass))
       return false;
    chain->passes.push_back(pass);
    return true;
@@ -1644,7 +1632,7 @@ static void cg_d3d9_renderchain_viewport_info(void *data, struct video_viewport
 renderchain_driver_t cg_d3d9_renderchain = {
    cg_d3d9_renderchain_free,
    cg_d3d9_renderchain_new,
-   d3d9_cg_init,
+   cg_d3d9_renderchain_init_shader,
    cg_d3d9_renderchain_init_shader_fvf,
    NULL,
    cg_d3d9_renderchain_init,
diff --git a/gfx/drivers_shader/shader_gl_cg.c b/gfx/drivers_shader/shader_gl_cg.c
index 3e67f138f1..3d15eeb3a6 100644
--- a/gfx/drivers_shader/shader_gl_cg.c
+++ b/gfx/drivers_shader/shader_gl_cg.c
@@ -895,7 +895,7 @@ static void *gl_cg_init(void *data, const char *path)
 
    if (!cg_data->cgCtx)
    {
-      RARCH_ERR("Failed to create Cg context.\n");
+      RARCH_ERR("Failed to create Cg context\n");
       goto error;
    }