Ignore:
Timestamp:
Mar 20, 2012, 12:04:34 AM (8 years ago)
Author:
ldelgass
Message:

remove global.h header. Move global Cg context handle into NvShader? as a
static member. Move LoadCgSourceProgram? to NvShader?.cpp, but make shader
classes use the methods NvShader::loadVertex/FragmentProgram instead.
There are still some users of LoadCgSourceProgram? left that need the context
handle.

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/packages/vizservers/nanovis/NvStdVertexShader.cpp

    r2859 r2870  
    22#include <stdio.h>
    33
    4 #include "global.h"
     4#include <GL/glew.h>
     5#include <Cg/cgGL.h>
     6
    57#include "NvStdVertexShader.h"
    68
     
    1618void NvStdVertexShader::init()
    1719{
    18     _cgVP = LoadCgSourceProgram(g_context, "vertex_std.cg", CG_PROFILE_VP30,
    19                                 "main");
     20    loadVertexProgram("vertex_std.cg", "main");
    2021    _mvp_vert_std_param = cgGetNamedParameter(_cgVP, "modelViewProjMatrix");
    2122    _mvi_vert_std_param = cgGetNamedParameter(_cgVP, "modelViewInv");
Note: See TracChangeset for help on using the changeset viewer.