- Timestamp:
- Mar 23, 2012 12:58:08 PM (12 years ago)
- Location:
- trunk/packages/vizservers/nanovis
- Files:
-
- 14 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/packages/vizservers/nanovis/HeightMap.cpp
r2877 r2882 103 103 104 104 cgGLBindProgram(_shader->getFP()); 105 cgGLEnableProfile(CG_PROFILE_FP 30);105 cgGLEnableProfile(CG_PROFILE_FP40); 106 106 107 107 cgGLSetTextureParameter(_tfParam, _tfPtr->id()); … … 137 137 glDisableClientState(GL_TEXTURE_COORD_ARRAY); 138 138 139 cgGLDisableProfile(CG_PROFILE_FP 30);139 cgGLDisableProfile(CG_PROFILE_FP40); 140 140 } 141 141 } … … 575 575 if (_tfPtr != NULL) { 576 576 cgGLBindProgram(_shader->getFP()); 577 cgGLEnableProfile(CG_PROFILE_FP 30);577 cgGLEnableProfile(CG_PROFILE_FP40); 578 578 579 579 cgGLSetTextureParameter(_tfParam, _tfPtr->id()); … … 611 611 glDisableClientState(GL_TEXTURE_COORD_ARRAY); 612 612 613 cgGLDisableProfile(CG_PROFILE_FP 30);613 cgGLDisableProfile(CG_PROFILE_FP40); 614 614 } 615 615 } -
trunk/packages/vizservers/nanovis/NvColorTableShader.cpp
r2870 r2882 34 34 35 35 cgGLBindProgram(_cgFP); 36 cgGLEnableProfile(CG_PROFILE_FP 30);36 cgGLEnableProfile(CG_PROFILE_FP40); 37 37 } 38 38 39 39 void NvColorTableShader::unbind() 40 40 { 41 cgGLDisableProfile(CG_PROFILE_FP 30);41 cgGLDisableProfile(CG_PROFILE_FP40); 42 42 cgGLDisableTextureParameter(_dataParam); 43 43 cgGLDisableTextureParameter(_tfParam); -
trunk/packages/vizservers/nanovis/NvLIC.cpp
r2870 r2882 115 115 _render_vel_fprog = 116 116 LoadCgSourceProgram(_cgContext, "render_vel.cg", 117 CG_PROFILE_FP 30, "main");117 CG_PROFILE_FP40, "main"); 118 118 119 119 _vel_tex_param_render_vel = … … 260 260 cgGLSetParameter1f(_max_param, max); 261 261 262 cgGLEnableProfile(CG_PROFILE_FP 30);262 cgGLEnableProfile(CG_PROFILE_FP40); 263 263 264 264 glBegin(GL_QUADS); … … 289 289 glEnd(); 290 290 291 cgGLDisableProfile(CG_PROFILE_FP 30);291 cgGLDisableProfile(CG_PROFILE_FP40); 292 292 293 293 cgGLDisableTextureParameter(_vel_tex_param_render_vel); -
trunk/packages/vizservers/nanovis/NvParticleAdvectionShader.cpp
r2870 r2882 51 51 cgGLEnableTextureParameter(_initPosTexParam); 52 52 53 cgGLEnableProfile(CG_PROFILE_FP 30);53 cgGLEnableProfile(CG_PROFILE_FP40); 54 54 } 55 55 … … 57 57 NvParticleAdvectionShader::unbind() 58 58 { 59 cgGLDisableProfile(CG_PROFILE_FP 30);59 cgGLDisableProfile(CG_PROFILE_FP40); 60 60 61 61 cgGLDisableTextureParameter(_velTexParam); -
trunk/packages/vizservers/nanovis/NvParticleAdvectionShader.h
r2837 r2882 48 48 CGparameter _maxParam; 49 49 CGparameter _modeParam; 50 50 51 unsigned int _velocityVolumeID; 51 52 Vector3 _scale; -
trunk/packages/vizservers/nanovis/NvRegularVolumeShader.cpp
r2877 r2882 59 59 60 60 cgGLBindProgram(_cgFP); 61 cgGLEnableProfile(CG_PROFILE_FP 30);61 cgGLEnableProfile(CG_PROFILE_FP40); 62 62 } 63 63 … … 67 67 cgGLDisableTextureParameter(_tf_one_volume_param); 68 68 69 cgGLDisableProfile(CG_PROFILE_FP 30);69 cgGLDisableProfile(CG_PROFILE_FP40); 70 70 } -
trunk/packages/vizservers/nanovis/NvStdVertexShader.cpp
r2870 r2882 28 28 cgGLSetStateMatrixParameter(_mvi_vert_std_param, CG_GL_MODELVIEW_MATRIX, CG_GL_MATRIX_INVERSE); 29 29 cgGLBindProgram(_cgVP); 30 cgGLEnableProfile(CG_PROFILE_VP 30);30 cgGLEnableProfile(CG_PROFILE_VP40); 31 31 } 32 32 33 33 void NvStdVertexShader::unbind() 34 34 { 35 cgGLDisableProfile(CG_PROFILE_VP 30);35 cgGLDisableProfile(CG_PROFILE_VP40); 36 36 } -
trunk/packages/vizservers/nanovis/NvZincBlendeVolumeShader.cpp
r2877 r2882 65 65 66 66 cgGLBindProgram(_cgFP); 67 cgGLEnableProfile(CG_PROFILE_FP 30);67 cgGLEnableProfile(CG_PROFILE_FP40); 68 68 } 69 69 … … 74 74 cgGLDisableTextureParameter(_tfParam); 75 75 76 cgGLDisableProfile(CG_PROFILE_FP 30);76 cgGLDisableProfile(CG_PROFILE_FP40); 77 77 } -
trunk/packages/vizservers/nanovis/ParticleSystem.cpp
r2870 r2882 431 431 _distanceInitFP = 432 432 cgCreateProgramFromFile(_context, CG_SOURCE, path.c_str(), 433 CG_PROFILE_FP 30, "initSortIndex", NULL);433 CG_PROFILE_FP40, "initSortIndex", NULL); 434 434 cgGLLoadProgram(_distanceInitFP); 435 435 436 436 _distanceSortFP = 437 437 cgCreateProgramFromFile(_context, CG_SOURCE, path.c_str(), 438 CG_PROFILE_FP 30, "computeDistance", NULL);438 CG_PROFILE_FP40, "computeDistance", NULL); 439 439 _viewPosParam = cgGetNamedParameter(_distanceSortFP, "viewerPosition"); 440 440 cgGLLoadProgram(_distanceSortFP); … … 442 442 _distanceSortLookupFP = 443 443 cgCreateProgramFromFile(_context, CG_SOURCE, path.c_str(), 444 CG_PROFILE_FP 30, "lookupPosition", NULL);444 CG_PROFILE_FP40, "lookupPosition", NULL); 445 445 cgGLLoadProgram(_distanceSortLookupFP); 446 446 … … 448 448 _sortRecursionFP = 449 449 cgCreateProgramFromFile(_context, CG_SOURCE, path.c_str(), 450 CG_PROFILE_FP 30, "mergeSortRecursion", NULL);450 CG_PROFILE_FP40, "mergeSortRecursion", NULL); 451 451 cgGLLoadProgram(_sortRecursionFP); 452 452 … … 457 457 _sortEndFP = 458 458 cgCreateProgramFromFile(_context, CG_SOURCE, path.c_str(), 459 CG_PROFILE_FP 30, "mergeSortEnd", NULL);459 CG_PROFILE_FP40, "mergeSortEnd", NULL); 460 460 cgGLLoadProgram(_sortEndFP); 461 461 … … 466 466 _passthroughFP = 467 467 cgCreateProgramFromFile(_context, CG_SOURCE, path.c_str(), 468 CG_PROFILE_FP 30, "main", NULL);468 CG_PROFILE_FP40, "main", NULL); 469 469 cgGLLoadProgram(_passthroughFP); 470 470 … … 475 475 _moveParticlesFP = 476 476 cgCreateProgramFromFile(_context, CG_SOURCE, path.c_str(), 477 CG_PROFILE_FP 30, "main", NULL);477 CG_PROFILE_FP40, "main", NULL); 478 478 cgGLLoadProgram(_moveParticlesFP); 479 479 _mpTimeScale = cgGetNamedParameter(_moveParticlesFP, "timeStep"); … … 504 504 _initParticlePosFP = 505 505 cgCreateProgramFromFile(_context, CG_SOURCE, path.c_str(), 506 CG_PROFILE_FP 30, "initParticlePosMain", NULL);506 CG_PROFILE_FP40, "initParticlePosMain", NULL); 507 507 cgGLLoadProgram(_initParticlePosFP); 508 508 _ipVectorFieldParam = cgGetNamedParameter(_moveParticlesFP, "vfield"); … … 512 512 { 513 513 cgGLBindProgram(_passthroughFP); 514 cgGLEnableProfile(CG_PROFILE_FP 30);514 cgGLEnableProfile(CG_PROFILE_FP40); 515 515 516 516 cgGLSetParameter4f(_scaleParam, 1.0, 1.0, 1.0, 1.0); … … 522 522 drawQuad(); 523 523 524 cgGLDisableProfile(CG_PROFILE_FP 30);524 cgGLDisableProfile(CG_PROFILE_FP40); 525 525 } 526 526 … … 631 631 632 632 cgGLBindProgram(_distanceInitFP); 633 cgGLEnableProfile(CG_PROFILE_FP 30);633 cgGLEnableProfile(CG_PROFILE_FP40); 634 634 635 635 drawQuad(); 636 636 637 cgGLDisableProfile(CG_PROFILE_FP 30);637 cgGLDisableProfile(CG_PROFILE_FP40); 638 638 glBindFramebufferEXT(GL_FRAMEBUFFER_EXT, 0); 639 639 … … 942 942 943 943 cgGLBindProgram(_moveParticlesFP); 944 cgGLEnableProfile(CG_PROFILE_FP 30);944 cgGLEnableProfile(CG_PROFILE_FP40); 945 945 cgGLSetParameter1f(_mpTimeScale, 0.005); 946 946 cgGLSetParameter1f(_mpUseInitTex, 1.0); … … 964 964 cgGLDisableTextureParameter(_mpVectorField); 965 965 glDisable(GL_TEXTURE_RECTANGLE_NV); 966 cgGLDisableProfile(CG_PROFILE_FP 30);966 cgGLDisableProfile(CG_PROFILE_FP40); 967 967 968 968 glMatrixMode(GL_PROJECTION); … … 1055 1055 1056 1056 cgGLBindProgram(_moveParticlesFP); 1057 cgGLEnableProfile(CG_PROFILE_FP 30);1057 cgGLEnableProfile(CG_PROFILE_FP40); 1058 1058 1059 1059 // INSOO … … 1086 1086 1087 1087 glDisable(GL_TEXTURE_RECTANGLE_NV); 1088 cgGLDisableProfile(CG_PROFILE_FP 30);1088 cgGLDisableProfile(CG_PROFILE_FP40); 1089 1089 1090 1090 glMatrixMode(GL_PROJECTION); … … 1188 1188 1189 1189 cgGLBindProgram(_initParticlePosFP); 1190 cgGLEnableProfile(CG_PROFILE_FP 30);1190 cgGLEnableProfile(CG_PROFILE_FP40); 1191 1191 cgGLSetTextureParameter(_ipVectorFieldParam, _curVectorFieldID); 1192 1192 cgGLEnableTextureParameter(_ipVectorFieldParam); … … 1216 1216 glDisable(GL_TEXTURE_RECTANGLE_NV); 1217 1217 cgGLDisableTextureParameter(_ipVectorFieldParam); 1218 cgGLDisableProfile(CG_PROFILE_FP 30);1218 cgGLDisableProfile(CG_PROFILE_FP40); 1219 1219 1220 1220 glMatrixMode(GL_PROJECTION); … … 1241 1241 1242 1242 cgGLBindProgram(_initParticlePosFP); 1243 cgGLEnableProfile(CG_PROFILE_FP 30);1243 cgGLEnableProfile(CG_PROFILE_FP40); 1244 1244 cgGLSetTextureParameter(_ipVectorFieldParam, _curVectorFieldID); 1245 1245 cgGLEnableTextureParameter(_ipVectorFieldParam); … … 1270 1270 glDisable(GL_TEXTURE_RECTANGLE_NV); 1271 1271 cgGLDisableTextureParameter(_ipVectorFieldParam); 1272 cgGLDisableProfile(CG_PROFILE_FP 30);1272 cgGLDisableProfile(CG_PROFILE_FP40); 1273 1273 1274 1274 glMatrixMode(GL_PROJECTION); … … 1317 1317 1318 1318 cgGLBindProgram(_distanceSortFP); 1319 cgGLEnableProfile(CG_PROFILE_FP 30);1319 cgGLEnableProfile(CG_PROFILE_FP40); 1320 1320 1321 1321 glActiveTextureARB(GL_TEXTURE0_ARB); … … 1342 1342 drawQuad(); 1343 1343 1344 cgGLDisableProfile(CG_PROFILE_FP 30);1344 cgGLDisableProfile(CG_PROFILE_FP40); 1345 1345 1346 1346 glMatrixMode(GL_PROJECTION); … … 1423 1423 glBindFramebufferEXT(GL_FRAMEBUFFER_EXT, psys_fbo[_destPosIndex]); 1424 1424 cgGLBindProgram(_distanceSortLookupFP); 1425 cgGLEnableProfile(CG_PROFILE_FP 30);1425 cgGLEnableProfile(CG_PROFILE_FP40); 1426 1426 1427 1427 glActiveTextureARB(GL_TEXTURE0_ARB); … … 1450 1450 1451 1451 glBindFramebufferEXT(GL_FRAMEBUFFER_EXT, 0); 1452 cgGLDisableProfile(CG_PROFILE_FP 30);1452 cgGLDisableProfile(CG_PROFILE_FP40); 1453 1453 1454 1454 // POSITION LOOKUP … … 1501 1501 glBindFramebufferEXT(GL_FRAMEBUFFER_EXT, sort_fbo[_destSortIndex]); 1502 1502 cgGLBindProgram(_sortRecursionFP); 1503 cgGLEnableProfile(CG_PROFILE_FP 30);1503 cgGLEnableProfile(CG_PROFILE_FP40); 1504 1504 1505 1505 glActiveTextureARB(GL_TEXTURE0_ARB); … … 1527 1527 glPopAttrib(); 1528 1528 1529 cgGLDisableProfile(CG_PROFILE_FP 30);1529 cgGLDisableProfile(CG_PROFILE_FP40); 1530 1530 1531 1531 glBindFramebufferEXT(GL_FRAMEBUFFER_EXT, 0); … … 1544 1544 glBindFramebufferEXT(GL_FRAMEBUFFER_EXT, sort_fbo[_destSortIndex]); 1545 1545 cgGLBindProgram(_sortEndFP); 1546 cgGLEnableProfile(CG_PROFILE_FP 30);1546 cgGLEnableProfile(CG_PROFILE_FP40); 1547 1547 1548 1548 glActiveTextureARB(GL_TEXTURE0_ARB); … … 1569 1569 glPopAttrib(); 1570 1570 1571 cgGLDisableProfile(CG_PROFILE_FP 30);1571 cgGLDisableProfile(CG_PROFILE_FP40); 1572 1572 1573 1573 glBindTexture(GL_TEXTURE_RECTANGLE_NV , 0); -
trunk/packages/vizservers/nanovis/PointShader.h
r2833 r2882 29 29 if (_cgVP) { 30 30 cgGLBindProgram(_cgVP); 31 cgGLEnableProfile((CGprofile) CG_PROFILE_VP 30);31 cgGLEnableProfile((CGprofile) CG_PROFILE_VP40); 32 32 } 33 33 if (_cgFP) { 34 34 cgGLBindProgram(_cgFP); 35 cgGLEnableProfile((CGprofile) CG_PROFILE_FP 30);35 cgGLEnableProfile((CGprofile) CG_PROFILE_FP40); 36 36 } 37 37 } … … 40 40 { 41 41 if (_cgVP) { 42 cgGLDisableProfile((CGprofile)CG_PROFILE_VP 30);42 cgGLDisableProfile((CGprofile)CG_PROFILE_VP40); 43 43 } 44 44 if (_cgFP) { 45 cgGLDisableProfile((CGprofile)CG_PROFILE_FP 30);45 cgGLDisableProfile((CGprofile)CG_PROFILE_FP40); 46 46 } 47 47 -
trunk/packages/vizservers/nanovis/Unirect.cpp
r2881 r2882 315 315 } 316 316 317 318 317 int 319 318 Rappture::Unirect2d::LoadData(Tcl_Interp *interp, int objc, … … 490 489 return TCL_OK; 491 490 } 492 493 491 494 492 bool … … 637 635 } 638 636 639 640 637 bool 641 638 Rappture::Unirect3d::Resample(Rappture::Outcome &result, size_t nSamples) -
trunk/packages/vizservers/nanovis/VelocityArrowsSlice.cpp
r2877 r2882 29 29 30 30 _queryVelocityFP = 31 LoadCgSourceProgram(_context, "queryvelocity.cg", CG_PROFILE_FP 30, "main");31 LoadCgSourceProgram(_context, "queryvelocity.cg", CG_PROFILE_FP40, "main"); 32 32 33 33 _qvVectorFieldParam = cgGetNamedParameter(_queryVelocityFP, "vfield"); … … 191 191 glDisable(GL_DEPTH_TEST); 192 192 cgGLBindProgram(_queryVelocityFP); 193 cgGLEnableProfile(CG_PROFILE_FP 30);193 cgGLEnableProfile(CG_PROFILE_FP40); 194 194 cgGLSetTextureParameter(_qvVectorFieldParam, _vectorFieldGraphicsID); 195 195 cgGLEnableTextureParameter(_qvVectorFieldParam); … … 220 220 glDisable(GL_TEXTURE_RECTANGLE_NV); 221 221 cgGLDisableTextureParameter(_qvVectorFieldParam); 222 cgGLDisableProfile(CG_PROFILE_FP 30);222 cgGLDisableProfile(CG_PROFILE_FP40); 223 223 224 224 glReadPixels(0, 0, _renderTargetWidth, _renderTargetHeight, GL_RGB, GL_FLOAT, _velocities); -
trunk/packages/vizservers/nanovis/nanovis.cpp
r2880 r2882 761 761 } 762 762 #endif 763 if (!GLEW_NV_vertex_program3 || 764 !GLEW_NV_fragment_program2) { 765 ERROR("NV_vertex_program3 and NV_fragment_program2 extensions are required to run nanovis\n"); 766 doExit(1); 767 } 763 768 764 769 if (!R2FilePath::getInstance()->setPath(path)) { -
trunk/packages/vizservers/nanovis/shaders/update_pos.cg
r2852 r2882 52 52 53 53 //reconstruct negative value 54 //float4 vel = float4(tex3D(vel_tex, pos.xyz).xyz, 0) - float4(0.5, 0.5, 0.5, 0.0f);55 54 float4 vel = float4(tex3D(vel_tex, pos.xyz).yzw, 0) - float4(0.5, 0.5, 0.5, 0.0f); 56 55 vel = vel * (2 * max);
Note: See TracChangeset
for help on using the changeset viewer.