Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(707)

Side by Side Diff: core/cross/gl/renderer_gl.cc

Issue 159168: This fixes a number of things that are warnings in the Mac compiler.... (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/o3d/
Patch Set: Created 11 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 /* 1 /*
2 * Copyright 2009, Google Inc. 2 * Copyright 2009, Google Inc.
3 * All rights reserved. 3 * All rights reserved.
4 * 4 *
5 * Redistribution and use in source and binary forms, with or without 5 * Redistribution and use in source and binary forms, with or without
6 * modification, are permitted provided that the following conditions are 6 * modification, are permitted provided that the following conditions are
7 * met: 7 * met:
8 * 8 *
9 * * Redistributions of source code must retain the above copyright 9 * * Redistributions of source code must retain the above copyright
10 * notice, this list of conditions and the following disclaimer. 10 * notice, this list of conditions and the following disclaimer.
(...skipping 510 matching lines...) Expand 10 before | Expand all | Expand 10 after
521 } 521 }
522 }; 522 };
523 523
524 RendererGL* RendererGL::CreateDefault(ServiceLocator* service_locator) { 524 RendererGL* RendererGL::CreateDefault(ServiceLocator* service_locator) {
525 return new RendererGL(service_locator); 525 return new RendererGL(service_locator);
526 } 526 }
527 527
528 RendererGL::RendererGL(ServiceLocator* service_locator) 528 RendererGL::RendererGL(ServiceLocator* service_locator)
529 : Renderer(service_locator), 529 : Renderer(service_locator),
530 semantic_manager_(service_locator), 530 semantic_manager_(service_locator),
531 #ifdef OS_MACOSX
532 mac_agl_context_(0),
533 mac_cgl_context_(0),
534 #endif
535 #ifdef OS_WIN 531 #ifdef OS_WIN
536 gl_context_(NULL), 532 gl_context_(NULL),
537 #endif 533 #endif
534 fullscreen_(0),
538 #ifdef OS_LINUX 535 #ifdef OS_LINUX
539 display_(NULL), 536 display_(NULL),
540 window_(0), 537 window_(0),
541 context_(0), 538 context_(0),
542 #endif 539 #endif
543 fullscreen_(0), 540 #ifdef OS_MACOSX
541 mac_agl_context_(0),
542 mac_cgl_context_(0),
543 #endif
544 render_surface_framebuffer_(0), 544 render_surface_framebuffer_(0),
545 cg_context_(NULL), 545 cg_context_(NULL),
546 alpha_function_ref_changed_(true), 546 alpha_function_ref_changed_(true),
547 alpha_function_(GL_ALWAYS), 547 alpha_function_(GL_ALWAYS),
548 alpha_ref_(0.f), 548 alpha_ref_(0.f),
549 alpha_blend_settings_changed_(true), 549 alpha_blend_settings_changed_(true),
550 separate_alpha_blend_enable_(false), 550 separate_alpha_blend_enable_(false),
551 stencil_settings_changed_(true), 551 stencil_settings_changed_(true),
552 separate_stencil_settings_enable_(false), 552 separate_stencil_settings_enable_(false),
553 stencil_ref_(0), 553 stencil_ref_(0),
(...skipping 1037 matching lines...) Expand 10 before | Expand all | Expand 10 after
1591 return swizzle_table; 1591 return swizzle_table;
1592 } 1592 }
1593 1593
1594 // This is a factory function for creating Renderer objects. Since 1594 // This is a factory function for creating Renderer objects. Since
1595 // we're implementing GL, we only ever return a GL renderer. 1595 // we're implementing GL, we only ever return a GL renderer.
1596 Renderer* Renderer::CreateDefaultRenderer(ServiceLocator* service_locator) { 1596 Renderer* Renderer::CreateDefaultRenderer(ServiceLocator* service_locator) {
1597 return RendererGL::CreateDefault(service_locator); 1597 return RendererGL::CreateDefault(service_locator);
1598 } 1598 }
1599 1599
1600 } // namespace o3d 1600 } // namespace o3d
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698