Ignore:
Timestamp:
Dec 20, 2014, 1:00:34 AM (5 years ago)
Author:
ldelgass
Message:

Merge r3611:3618 from trunk

Location:
nanovis/branches/1.1
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • nanovis/branches/1.1

  • nanovis/branches/1.1/nanovisServer.cpp

    r4883 r4889  
    3636#include "Command.h"
    3737#include "ReadBuffer.h"
    38 #include "NvShader.h"
     38#include "Shader.h"
    3939#include "Trace.h"
    4040
     
    334334    NanoVis::removeAllData();
    335335
    336     NvShader::exitCg();
     336    Shader::exitCg();
    337337
    338338    //close log file
     
    493493void shaderErrorCallback(void)
    494494{
    495     if (!NvShader::printErrorInfo()) {
     495    if (!Shader::printErrorInfo()) {
    496496        TRACE("Shader error, exiting...");
    497497        exitService(1);
     
    574574    TRACE("File descriptors: in %d out %d log %d", g_fdIn, g_fdOut, fileno(g_fLog));
    575575
     576    /* This synchronizes the client with the server, so that the client
     577     * doesn't start writing commands before the server is ready. It could
     578     * also be used to supply information about the server (version, memory
     579     * size, etc). */
    576580    fprintf(g_fOut, "NanoVis %s (build %s)\n", NANOVIS_VERSION_STRING, SVN_VERSION);
    577581    fflush(g_fOut);
     
    634638
    635639    // Override callback with one that cleans up server on exit
    636     NvShader::setErrorCallback(shaderErrorCallback);
     640    Shader::setErrorCallback(shaderErrorCallback);
    637641
    638642    if (!NanoVis::initGL()) {
Note: See TracChangeset for help on using the changeset viewer.